summaryrefslogtreecommitdiffstats
path: root/hw/ppc_oldworld.c
diff options
context:
space:
mode:
authorAvi Kivity2011-07-26 13:26:19 +0200
committerAnthony Liguori2011-07-29 15:25:44 +0200
commit1e39101c649a008462db1ac1d027c62870454d1f (patch)
treeb2c6402330466d10502e56e4b60a3600c7e298df /hw/ppc_oldworld.c
parentpc: move global memory map out of pc_init1() and into its callers (diff)
downloadqemu-1e39101c649a008462db1ac1d027c62870454d1f.tar.gz
qemu-1e39101c649a008462db1ac1d027c62870454d1f.tar.xz
qemu-1e39101c649a008462db1ac1d027c62870454d1f.zip
pci: pass address space to pci bus when created
This is now done sloppily, via get_system_memory(). Eventually callers will be converted to stop using that. Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ppc_oldworld.c')
-rw-r--r--hw/ppc_oldworld.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 20cd8e1a8d..585afd6c4b 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -43,6 +43,7 @@
#include "kvm.h"
#include "kvm_ppc.h"
#include "blockdev.h"
+#include "exec-memory.h"
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
@@ -233,7 +234,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
hw_error("Only 6xx bus is supported on heathrow machine\n");
}
pic = heathrow_pic_init(&pic_mem_index, 1, heathrow_irqs);
- pci_bus = pci_grackle_init(0xfec00000, pic);
+ pci_bus = pci_grackle_init(0xfec00000, pic, get_system_memory());
pci_vga_init(pci_bus);
escc_mem_index = escc_init(0x80013000, pic[0x0f], pic[0x10], serial_hds[0],