diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:48:24 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:48:24 -0500 |
| commit | 8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d (patch) | |
| tree | fe43017f2bf431bc55a90b28e6c0e9357c4d46bd /hw/dummy_m68k.c | |
| parent | 444dc48298c480e42e15a8fe676be737d8a6b2a1 (diff) | |
| parent | 2b90ca040c59d73943061e49f39455964e8af158 (diff) | |
| download | focaccia-qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.tar.gz focaccia-qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.zip | |
Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging
Diffstat (limited to 'hw/dummy_m68k.c')
| -rw-r--r-- | hw/dummy_m68k.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c index eed9e3843c..30146b9c9d 100644 --- a/hw/dummy_m68k.c +++ b/hw/dummy_m68k.c @@ -10,6 +10,7 @@ #include "boards.h" #include "loader.h" #include "elf.h" +#include "exec-memory.h" #define KERNEL_LOAD_ADDR 0x10000 @@ -21,6 +22,8 @@ static void dummy_m68k_init(ram_addr_t ram_size, const char *initrd_filename, const char *cpu_model) { CPUState *env; + MemoryRegion *address_space_mem = get_system_memory(); + MemoryRegion *ram = g_new(MemoryRegion, 1); int kernel_size; uint64_t elf_entry; target_phys_addr_t entry; @@ -37,8 +40,8 @@ static void dummy_m68k_init(ram_addr_t ram_size, env->vbr = 0; /* RAM at address zero */ - cpu_register_physical_memory(0, ram_size, - qemu_ram_alloc(NULL, "dummy_m68k.ram", ram_size) | IO_MEM_RAM); + memory_region_init_ram(ram, NULL, "dummy_m68k.ram", ram_size); + memory_region_add_subregion(address_space_mem, 0, ram); /* Load kernel. */ if (kernel_filename) { |