aboutsummaryrefslogtreecommitdiff
path: root/hw/z2.c
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2011-08-11 16:07:19 -0700
committerAvi Kivity <avi@redhat.com>2011-10-02 16:14:02 +0200
commita6dc4c2d95f7b7bd95a53e8c2e524a8a202b4d1f (patch)
tree1460cb186c2179a19d8f410c147331cdbe198f9d /hw/z2.c
parent3e9f0113b4c5ec37fbba0a50b28ea26c8477da93 (diff)
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/z2.c')
-rw-r--r--hw/z2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/z2.c b/hw/z2.c
index b6ae608657..a03bb33d1b 100644
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -20,6 +20,7 @@
#include "blockdev.h"
#include "console.h"
#include "audio/audio.h"
+#include "exec-memory.h"
#ifdef DEBUG_Z2
#define DPRINTF(fmt, ...) \
@@ -277,6 +278,7 @@ static void z2_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();
uint32_t sector_len = 0x10000;
PXA2xxState *cpu;
DriveInfo *dinfo;
@@ -290,7 +292,7 @@ static void z2_init(ram_addr_t ram_size,
}
/* Setup CPU & memory */
- cpu = pxa270_init(z2_binfo.ram_size, cpu_model);
+ cpu = pxa270_init(address_space_mem, z2_binfo.ram_size, cpu_model);
#ifdef TARGET_WORDS_BIGENDIAN
be = 1;