summaryrefslogtreecommitdiff
path: root/hw/tosa.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-10-05 18:29:06 +0200
committerAvi Kivity <avi@redhat.com>2011-11-24 18:31:54 +0200
commit04d66689978ba9098bed6210bf4d1befd448b179 (patch)
treec315e0eb80fb9f67f9f134640ad0132cfbfa6811 /hw/tosa.c
parent40897c9c160393df922dfdb59cfa210048d3071d (diff)
tosa: convert to memory API
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/tosa.c')
-rw-r--r--hw/tosa.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/tosa.c b/hw/tosa.c
index b992b994c7..67a71fee6c 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -208,6 +208,7 @@ static void tosa_init(ram_addr_t ram_size,
const char *initrd_filename, const char *cpu_model)
{
MemoryRegion *address_space_mem = get_system_memory();
+ MemoryRegion *rom = g_new(MemoryRegion, 1);
PXA2xxState *cpu;
TC6393xbState *tmio;
DeviceState *scp0, *scp1;
@@ -217,8 +218,9 @@ static void tosa_init(ram_addr_t ram_size,
cpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
- cpu_register_physical_memory(0, TOSA_ROM,
- qemu_ram_alloc(NULL, "tosa.rom", TOSA_ROM) | IO_MEM_ROM);
+ memory_region_init_ram(rom, NULL, "tosa.rom", TOSA_ROM);
+ memory_region_set_readonly(rom, true);
+ memory_region_add_subregion(address_space_mem, 0, rom);
tmio = tc6393xb_init(address_space_mem, 0x10000000,
qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_TC6393XB_INT));