motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/xen: Rename 'ram_memory' global variable as 'xen_memory'

Browse source 
To avoid a potential global variable shadow in
hw/i386/pc_piix.c::pc_init1(), rename Xen's
"ram_memory" as "xen_memory".

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
Message-Id: <20231114143816.71079-11-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-11-14 11:22:29 +01:00
parent 9cd909ac35
commit b934c3fa21
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/arm/xen_arm.c
View file

@ -114,14 +114,14 @@ static void xen_init_ram(MachineState *machine)
block_len = GUEST_RAM1_BASE + ram_size[1]; block_len = GUEST_RAM1_BASE + ram_size[1];
} }
memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len, memory_region_init_ram(&xen_memory, NULL, "xen.ram", block_len,
&error_fatal); &error_fatal);
memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", &ram_memory, memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", &xen_memory,
GUEST_RAM0_BASE, ram_size[0]); GUEST_RAM0_BASE, ram_size[0]);
memory_region_add_subregion(sysmem, GUEST_RAM0_BASE, &ram_lo); memory_region_add_subregion(sysmem, GUEST_RAM0_BASE, &ram_lo);
if (ram_size[1] > 0) { if (ram_size[1] > 0) {
memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", &ram_memory, memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", &xen_memory,
GUEST_RAM1_BASE, ram_size[1]); GUEST_RAM1_BASE, ram_size[1]);
memory_region_add_subregion(sysmem, GUEST_RAM1_BASE, &ram_hi); memory_region_add_subregion(sysmem, GUEST_RAM1_BASE, &ram_hi);
} }

10
hw/i386/xen/xen-hvm.c
View file

@ -149,12 +149,12 @@ static void xen_ram_init(PCMachineState *pcms,
*/ */
block_len = (4 * GiB) + x86ms->above_4g_mem_size; block_len = (4 * GiB) + x86ms->above_4g_mem_size;
} }
memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len, memory_region_init_ram(&xen_memory, NULL, "xen.ram", block_len,
&error_fatal); &error_fatal);
*ram_memory_p = &ram_memory; *ram_memory_p = &xen_memory;
memory_region_init_alias(&ram_640k, NULL, "xen.ram.640k", memory_region_init_alias(&ram_640k, NULL, "xen.ram.640k",
&ram_memory, 0, 0xa0000); &xen_memory, 0, 0xa0000);
memory_region_add_subregion(sysmem, 0, &ram_640k); memory_region_add_subregion(sysmem, 0, &ram_640k);
/* Skip of the VGA IO memory space, it will be registered later by the VGA /* Skip of the VGA IO memory space, it will be registered later by the VGA
* emulated device. * emulated device.
@ -163,12 +163,12 @@ static void xen_ram_init(PCMachineState *pcms,
* the Options ROM, so it is registered here as RAM. * the Options ROM, so it is registered here as RAM.
*/ */
memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo",
&ram_memory, 0xc0000, &xen_memory, 0xc0000,
x86ms->below_4g_mem_size - 0xc0000); x86ms->below_4g_mem_size - 0xc0000);
memory_region_add_subregion(sysmem, 0xc0000, &ram_lo); memory_region_add_subregion(sysmem, 0xc0000, &ram_lo);
if (x86ms->above_4g_mem_size > 0) { if (x86ms->above_4g_mem_size > 0) {
memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi",
&ram_memory, 0x100000000ULL, &xen_memory, 0x100000000ULL,
x86ms->above_4g_mem_size); x86ms->above_4g_mem_size);
memory_region_add_subregion(sysmem, 0x100000000ULL, &ram_hi); memory_region_add_subregion(sysmem, 0x100000000ULL, &ram_hi);
} }

6
hw/xen/xen-hvm-common.c
View file

@ -9,7 +9,7 @@
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/xen/arch_hvm.h" #include "hw/xen/arch_hvm.h"
MemoryRegion ram_memory; MemoryRegion xen_memory;
void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr, void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
Error **errp) Error **errp)
@ -26,7 +26,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
return; return;
} }
if (mr == &ram_memory) { if (mr == &xen_memory) {
return; return;
} }
@ -53,7 +53,7 @@ static void xen_set_memory(struct MemoryListener *listener,
{ {
XenIOState *state = container_of(listener, XenIOState, memory_listener); XenIOState *state = container_of(listener, XenIOState, memory_listener);
if (section->mr == &ram_memory) { if (section->mr == &xen_memory) {
return; return;
} else { } else {
if (add) { if (add) {

2
include/hw/xen/xen-hvm-common.h
View file

@ -15,7 +15,7 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include <xen/hvm/ioreq.h> #include <xen/hvm/ioreq.h>
extern MemoryRegion ram_memory; extern MemoryRegion xen_memory;
extern MemoryListener xen_io_listener; extern MemoryListener xen_io_listener;
extern DeviceListener xen_device_listener; extern DeviceListener xen_device_listener;