From: Dominik Dingel <dingel@linux.vnet.ibm.com>
Date: Tue, 12 May 2015 11:21:30 +0000 (+0200)
Subject: s390x: switch to memory_region_allocate_system_memory
X-Git-Tag: v2.5.0-rc0~13^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae23a33591056d6349753766047ebc511158da9c;p=thirdparty%2Fqemu.git

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

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 84221f4f571..5a52ff26eb1 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 */