diff options
author | Richard Henderson <rth@twiddle.net> | 2011-08-11 16:07:19 -0700 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-10-02 16:14:02 +0200 |
commit | a6dc4c2d95f7b7bd95a53e8c2e524a8a202b4d1f (patch) | |
tree | 1460cb186c2179a19d8f410c147331cdbe198f9d /hw/tosa.c | |
parent | 3e9f0113b4c5ec37fbba0a50b28ea26c8477da93 (diff) | |
download | qemu-a6dc4c2d95f7b7bd95a53e8c2e524a8a202b4d1f.zip qemu-a6dc4c2d95f7b7bd95a53e8c2e524a8a202b4d1f.tar.gz qemu-a6dc4c2d95f7b7bd95a53e8c2e524a8a202b4d1f.tar.bz2 |
pxa: Pass in address_space to pxa{255, 270}_init
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/tosa.c')
-rw-r--r-- | hw/tosa.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -20,6 +20,7 @@ #include "ssi.h" #include "blockdev.h" #include "sysbus.h" +#include "exec-memory.h" #define TOSA_RAM 0x04000000 #define TOSA_ROM 0x00800000 @@ -206,6 +207,7 @@ static void tosa_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { + MemoryRegion *address_space_mem = get_system_memory(); PXA2xxState *cpu; TC6393xbState *tmio; DeviceState *scp0, *scp1; @@ -213,7 +215,7 @@ static void tosa_init(ram_addr_t ram_size, if (!cpu_model) cpu_model = "pxa255"; - cpu = pxa255_init(tosa_binfo.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); |