diff options
author | Avi Kivity <avi@redhat.com> | 2011-10-05 18:29:06 +0200 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-11-24 18:31:54 +0200 |
commit | 04d66689978ba9098bed6210bf4d1befd448b179 (patch) | |
tree | c315e0eb80fb9f67f9f134640ad0132cfbfa6811 /hw/tosa.c | |
parent | 40897c9c160393df922dfdb59cfa210048d3071d (diff) | |
download | qemu-04d66689978ba9098bed6210bf4d1befd448b179.tar.gz qemu-04d66689978ba9098bed6210bf4d1befd448b179.tar.bz2 qemu-04d66689978ba9098bed6210bf4d1befd448b179.zip |
tosa: convert to memory API
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/tosa.c')
-rw-r--r-- | hw/tosa.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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)); |