diff options
| author | Avi Kivity <avi@redhat.com> | 2011-10-03 14:33:26 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-10-17 15:59:18 +0200 |
| commit | 9f7adc31adc20cc19908e116af444cb3215be552 (patch) | |
| tree | 2fb5019fe37818040d1f0347781dae53dc2f3b93 | |
| parent | d4edce380cd692c88031cfa5adc20251832b52ab (diff) | |
syborg: convert to memory API
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | hw/syborg.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/syborg.c b/hw/syborg.c index bc200e48aa..248de54c4e 100644 --- a/hw/syborg.c +++ b/hw/syborg.c @@ -26,6 +26,7 @@ #include "boards.h" #include "arm-misc.h" #include "net.h" +#include "exec-memory.h" static struct arm_boot_info syborg_binfo; @@ -35,9 +36,10 @@ static void syborg_init(ram_addr_t ram_size, const char *initrd_filename, const char *cpu_model) { CPUState *env; + MemoryRegion *sysmem = get_system_memory(); + MemoryRegion *ram = g_new(MemoryRegion, 1); qemu_irq *cpu_pic; qemu_irq pic[64]; - ram_addr_t ram_addr; DeviceState *dev; int i; @@ -50,8 +52,8 @@ static void syborg_init(ram_addr_t ram_size, } /* RAM at address zero. */ - ram_addr = qemu_ram_alloc(NULL, "syborg.ram", ram_size); - cpu_register_physical_memory(0, ram_size, ram_addr | IO_MEM_RAM); + memory_region_init_ram(ram, NULL, "syborg.ram", ram_size); + memory_region_add_subregion(sysmem, 0, ram); cpu_pic = arm_pic_init_cpu(env); dev = sysbus_create_simple("syborg,interrupt", 0xC0000000, |