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>
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

View file

@ -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) {