Signed-off-by: Avi Kivity <a...@redhat.com>
---
hw/an5206.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/an5206.c b/hw/an5206.c
index e34de39..9a91984 100644
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -6,6 +6,8 @@
* This code is licensed under the GPL
*/
+#include <glib.h>
+
#include "hw.h"
#include "pc.h"
#include "mcf.h"
@@ -39,6 +41,8 @@ static void an5206_init(MemoryRegion *address_space_mem,
int kernel_size;
uint64_t elf_entry;
target_phys_addr_t entry;
+ MemoryRegion *ram = g_new(MemoryRegion, 1);
+ MemoryRegion *sram = g_new(MemoryRegion, 1);
if (!cpu_model)
cpu_model = "m5206";
@@ -54,12 +58,12 @@ static void an5206_init(MemoryRegion *address_space_mem,
env->rambar0 = AN5206_RAMBAR_ADDR | 1;
/* DRAM at address zero */
- cpu_register_physical_memory(0, ram_size,
- qemu_ram_alloc(NULL, "an5206.ram", ram_size) | IO_MEM_RAM);
+ memory_region_init_ram(ram, NULL, "an5206.ram", ram_size);
+ memory_region_add_subregion(address_space_mem, 0, ram);
/* Internal SRAM. */
- cpu_register_physical_memory(AN5206_RAMBAR_ADDR, 512,
- qemu_ram_alloc(NULL, "an5206.sram", 512) | IO_MEM_RAM);
+ memory_region_init_ram(sram, NULL, "an5206.sram", 512);
+ memory_region_add_subregion(address_space_mem, AN5206_RAMBAR_ADDR, sram);
mcf5206_init(AN5206_MBAR_ADDR, env);
--
1.7.5.3
