diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-13 14:52:06 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-13 14:52:06 +0000 |
| commit | f673e70ccc668607620cd6d30fd0b9bc7a54151d (patch) | |
| tree | a2f5e596d4e2fba948b1d02ecdb689ff8f86e094 /hw/pci-host | |
| parent | 9d74f6fef0801ca2ce5c9d38d59b85bf03c27669 (diff) | |
| parent | ea81ce06a4d65c62cd8f2a3797953602fb7d7456 (diff) | |
Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' into staging
PReP machine and devices
* Cleanups for Raven PCI host bridge
* Removal of PReP machine and devices from qemu-system-ppcemb
# gpg: Signature made Mon 10 Feb 2014 16:19:03 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/prep-for-upstream:
prep: Drop from ppcemb-softmmu
raven: Use constant PCI_NUM_PINS instead of 4
prep: Kill get_system_io() usage
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/pci-host')
| -rw-r--r-- | hw/pci-host/prep.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 042dc8f225..0c948e2c30 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -47,7 +47,7 @@ typedef struct PRePPCIState { PCIHostState parent_obj; MemoryRegion intack; - qemu_irq irq[4]; + qemu_irq irq[PCI_NUM_PINS]; PCIBus pci_bus; RavenPCIState pci_dev; } PREPPCIState; @@ -121,11 +121,11 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) isa_mem_base = 0xc0000000; - for (i = 0; i < 4; i++) { + for (i = 0; i < PCI_NUM_PINS; i++) { sysbus_init_irq(dev, &s->irq[i]); } - pci_bus_irqs(&s->pci_bus, prep_set_irq, prep_map_irq, s->irq, 4); + pci_bus_irqs(&s->pci_bus, prep_set_irq, prep_map_irq, s->irq, PCI_NUM_PINS); memory_region_init_io(&h->conf_mem, OBJECT(h), &pci_host_conf_be_ops, s, "pci-conf-idx", 1); |