diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-11-14 11:22:29 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-03-09 18:51:45 +0100 |
| commit | b934c3fa21dbe23a17c9fdeccb85fb46418bc699 (patch) | |
| tree | 3ff3affedda613adbe13e286fb2bfe18c587614c /hw/xen | |
| parent | 9cd909ac3505c3561570793753c70ceafdd32eda (diff) | |
| download | focaccia-qemu-b934c3fa21dbe23a17c9fdeccb85fb46418bc699.tar.gz focaccia-qemu-b934c3fa21dbe23a17c9fdeccb85fb46418bc699.zip | |
hw/xen: Rename 'ram_memory' global variable as 'xen_memory'
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>
Diffstat (limited to 'hw/xen')
| -rw-r--r-- | hw/xen/xen-hvm-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index baa1adb9f2..dc69cada57 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -9,7 +9,7 @@ #include "hw/boards.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, Error **errp) @@ -26,7 +26,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr, return; } - if (mr == &ram_memory) { + if (mr == &xen_memory) { return; } @@ -53,7 +53,7 @@ static void xen_set_memory(struct MemoryListener *listener, { XenIOState *state = container_of(listener, XenIOState, memory_listener); - if (section->mr == &ram_memory) { + if (section->mr == &xen_memory) { return; } else { if (add) { |