From: Avi Kivity <avi@redhat.com>
Date: Sun, 2 Oct 2011 15:06:42 +0000 (+0200)
Subject: s390-virtio: convert to memory API
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~2224^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88c6a485b9e65dac8a931d04d75c43570e714c69;p=sdk%2Femulator%2Fqemu.git

s390-virtio: convert to memory API

Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 778cffe39c..60c66e92c4 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -29,6 +29,7 @@
 #include "hw/virtio.h"
 #include "hw/sysbus.h"
 #include "kvm.h"
+#include "exec-memory.h"
 
 #include "hw/s390-virtio-bus.h"
 
@@ -128,7 +129,8 @@ static void s390_init(ram_addr_t my_ram_size,
                       const char *cpu_model)
 {
     CPUState *env = NULL;
-    ram_addr_t ram_addr;
+    MemoryRegion *sysmem = get_system_memory();
+    MemoryRegion *ram = g_new(MemoryRegion, 1);
     ram_addr_t kernel_size = 0;
     ram_addr_t initrd_offset;
     ram_addr_t initrd_size = 0;
@@ -150,8 +152,8 @@ static void s390_init(ram_addr_t my_ram_size,
     s390_bus = s390_virtio_bus_init(&my_ram_size);
 
     /* allocate RAM */
-    ram_addr = qemu_ram_alloc(NULL, "s390.ram", my_ram_size);
-    cpu_register_physical_memory(0, my_ram_size, ram_addr);
+    memory_region_init_ram(ram, NULL, "s390.ram", my_ram_size);
+    memory_region_add_subregion(sysmem, 0, ram);
 
     /* allocate storage keys */
     storage_keys = g_malloc0(my_ram_size / TARGET_PAGE_SIZE);