From: Paolo Bonzini <pbonz...@redhat.com> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- hw/i386/pc.c | 4 +--- include/sysemu/sysemu.h | 5 +++++ numa.c | 10 ++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 44ee3b8..27f0f1f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1165,9 +1165,7 @@ FWCfgState *pc_memory_init(QEMUMachineInitArgs *args, * with older qemus that used qemu_ram_alloc(). */ ram = g_malloc(sizeof(*ram)); - memory_region_init_ram(ram, NULL, "pc.ram", - below_4g_mem_size + above_4g_mem_size); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "pc.ram", args); *ram_memory = ram; ram_below_4g = g_malloc(sizeof(*ram_below_4g)); memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", ram, diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 4c94cf5..e9da760 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -10,6 +10,8 @@ #include "qemu/notify.h" #include "qemu/main-loop.h" #include "qemu/bitmap.h" +#include "qom/object.h" +#include "hw/boards.h" /* vl.c */ @@ -144,6 +146,9 @@ void set_numa_nodes(void); void set_numa_modes(void); extern QemuOptsList qemu_numa_opts; int numa_init_func(QemuOpts *opts, void *opaque); +void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, + const char *name, + QEMUMachineInitArgs *args); #define MAX_OPTION_ROMS 16 typedef struct QEMUOptionRom { diff --git a/numa.c b/numa.c index 40c28b3..6441d14 100644 --- a/numa.c +++ b/numa.c @@ -187,3 +187,13 @@ void set_numa_modes(void) } } } + +void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, + const char *name, + QEMUMachineInitArgs *args) +{ + uint64_t ram_size = args->ram_size; + + memory_region_init_ram(mr, owner, name, ram_size); + vmstate_register_ram_global(mr); +} -- 1.8.5.2.229.g4448466