diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:44:52 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:44:52 -0500 |
| commit | 36f490b176afab3096e9c2877b365354f67e269d (patch) | |
| tree | b99964fa0e30e9a7931c4944cd1897f8f735aee3 /hw/realview.c | |
| parent | ebffe2afceb1a17b5d134b5debf553955fe5ea1a (diff) | |
| parent | 0d9595245393f6e59831447a06235a0a1b2cdfd4 (diff) | |
| download | qemu-36f490b176afab3096e9c2877b365354f67e269d.zip qemu-36f490b176afab3096e9c2877b365354f67e269d.tar.gz qemu-36f490b176afab3096e9c2877b365354f67e269d.tar.bz2 | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Diffstat (limited to 'hw/realview.c')
| -rw-r--r-- | hw/realview.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/hw/realview.c b/hw/realview.c index 549bb15..11ffb8a 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -272,8 +272,16 @@ static void realview_init(ram_addr_t ram_size, sysbus_create_simple("pl031", 0x10017000, pic[10]); if (!is_pb) { - dev = sysbus_create_varargs("realview_pci", 0x60000000, - pic[48], pic[49], pic[50], pic[51], NULL); + dev = qdev_create(NULL, "realview_pci"); + busdev = sysbus_from_qdev(dev); + qdev_init_nofail(dev); + sysbus_mmio_map(busdev, 0, 0x61000000); /* PCI self-config */ + sysbus_mmio_map(busdev, 1, 0x62000000); /* PCI config */ + sysbus_mmio_map(busdev, 2, 0x63000000); /* PCI I/O */ + sysbus_connect_irq(busdev, 0, pic[48]); + sysbus_connect_irq(busdev, 1, pic[49]); + sysbus_connect_irq(busdev, 2, pic[50]); + sysbus_connect_irq(busdev, 3, pic[51]); pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci"); if (usb_enabled) { usb_ohci_init_pci(pci_bus, -1); |