diff options
| author | Avi Kivity <avi@redhat.com> | 2011-10-02 17:06:42 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-10-17 15:59:17 +0200 |
| commit | ca3dbc2757f73969e601d901fa3aa4f0253be402 (patch) | |
| tree | cd26dcb200a7f27e4a12264ed2a5c7c00979864a /hw/s390-virtio.c | |
| parent | 35e87820d7c689c1fce3785837843fa77193fa38 (diff) | |
| download | qemu-ca3dbc2757f73969e601d901fa3aa4f0253be402.zip qemu-ca3dbc2757f73969e601d901fa3aa4f0253be402.tar.gz qemu-ca3dbc2757f73969e601d901fa3aa4f0253be402.tar.bz2 | |
s390-virtio: convert to memory API
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/s390-virtio.c')
| -rw-r--r-- | hw/s390-virtio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index 778cffe..60c66e9 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); |