diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-14 17:43:15 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 18:44:19 +0300 |
| commit | dfabb8b91655f680eaa1aa05e9f226fbd596a70f (patch) | |
| tree | 2ca85e70c45c9cb2c410f719ed2fbf21838066e8 /hw | |
| parent | d1169464245bcd4c89cbcc64f8937df61ae6bd4b (diff) | |
| download | qemu-dfabb8b91655f680eaa1aa05e9f226fbd596a70f.tar.gz qemu-dfabb8b91655f680eaa1aa05e9f226fbd596a70f.tar.bz2 qemu-dfabb8b91655f680eaa1aa05e9f226fbd596a70f.zip | |
numa: introduce memory_region_allocate_system_memory
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
MST: resolve conflicts
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc.c | 3 |
1 files changed, 1 insertions, 2 deletions
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, |