aboutsummaryrefslogtreecommitdiff
path: root/hw/ppc440_bamboo.c
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2011-08-11 16:07:18 -0700
committerAvi Kivity <avi@redhat.com>2011-10-02 16:14:02 +0200
commit3e9f0113b4c5ec37fbba0a50b28ea26c8477da93 (patch)
tree1eaf99263049012af9a30338ecc1ef956bb7524a /hw/ppc440_bamboo.c
parent52ce55a1024bc4b0d2c726080a205123efdd9780 (diff)
downloadqemu-3e9f0113b4c5ec37fbba0a50b28ea26c8477da93.zip
qemu-3e9f0113b4c5ec37fbba0a50b28ea26c8477da93.tar.gz
qemu-3e9f0113b4c5ec37fbba0a50b28ea26c8477da93.tar.bz2
ppc440: Pass in address_space_mem to ppc440ep_init
Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/ppc440_bamboo.c')
-rw-r--r--hw/ppc440_bamboo.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 1addb68..9228939 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -23,6 +23,7 @@
#include "device_tree.h"
#include "loader.h"
#include "elf.h"
+#include "exec-memory.h"
#define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
@@ -96,6 +97,7 @@ static void bamboo_init(ram_addr_t ram_size,
const char *cpu_model)
{
unsigned int pci_irq_nrs[4] = { 28, 27, 26, 25 };
+ MemoryRegion *address_space_mem = get_system_memory();
PCIBus *pcibus;
CPUState *env;
uint64_t elf_entry;
@@ -107,7 +109,8 @@ static void bamboo_init(ram_addr_t ram_size,
int i;
/* Setup CPU. */
- env = ppc440ep_init(&ram_size, &pcibus, pci_irq_nrs, 1, cpu_model);
+ env = ppc440ep_init(address_space_mem, &ram_size, &pcibus,
+ pci_irq_nrs, 1, cpu_model);
if (pcibus) {
/* Register network interfaces. */