From dfabb8b91655f680eaa1aa05e9f226fbd596a70f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 14 May 2014 17:43:15 +0800 Subject: numa: introduce memory_region_allocate_system_memory Signed-off-by: Paolo Bonzini Signed-off-by: Hu Tao Signed-off-by: Michael S. Tsirkin Acked-by: Michael S. Tsirkin Reviewed-by: Eduardo Habkost Signed-off-by: Michael S. Tsirkin MST: resolve conflicts --- hw/i386/pc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'hw') diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ac7ac774e6..c674c1c796 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1215,8 +1215,7 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory, * with older qemus that used qemu_ram_alloc(). */ ram = g_malloc(sizeof(*ram)); - memory_region_init_ram(ram, NULL, "pc.ram", ram_size); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "pc.ram", ram_size); *ram_memory = ram; ram_below_4g = g_malloc(sizeof(*ram_below_4g)); memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", ram, -- cgit v1.2.3