summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Dingel2015-05-12 13:21:30 +0200
committerCornelia Huck2015-11-11 17:21:39 +0100
commitae23a33591056d6349753766047ebc511158da9c (patch)
treebbbca756339f2e3fe6fc074d98e8d054d35bb303
parentMAINTAINERS: update virtio-ccw/s390 git tree (diff)
downloadqemu-ae23a33591056d6349753766047ebc511158da9c.tar.gz
qemu-ae23a33591056d6349753766047ebc511158da9c.tar.xz
qemu-ae23a33591056d6349753766047ebc511158da9c.zip
s390x: switch to memory_region_allocate_system_memory
By replacing memory_region_init_ram with memory_region_allocate_system_memory we gain goodies like mem-path backends. This will allow us to use hugetlbfs once the kernel supports it. Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
-rw-r--r--hw/s390x/s390-virtio-ccw.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 84221f4f57..5a52ff26eb 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -104,8 +104,7 @@ void s390_memory_init(ram_addr_t mem_size)
MemoryRegion *ram = g_new(MemoryRegion, 1);
/* allocate RAM for core */
- memory_region_init_ram(ram, NULL, "s390.ram", mem_size, &error_fatal);
- vmstate_register_ram_global(ram);
+ memory_region_allocate_system_memory(ram, NULL, "s390.ram", mem_size);
memory_region_add_subregion(sysmem, 0, ram);
/* Initialize storage key device */