Every single caller of pci_host_bus_init*() sets phb->bus to point to
'bus'. Do that inside pci_bus_new_inplace() to avoid code duplication
and make it harder to break.
Generated using the following Coccinelle patch:
@@
identifier b;
expression phb;
expression list ARGS;
@@
-b = pci_host_bus_init(phb, ARGS);
+pci_host_bus_init(phb, ARGS);
+b = phb->bus;
...
-phb->bus = b;
@@
expression phb;
expression list ARGS;
@@
-phb->bus = pci_host_bus_init(phb, ARGS);
+pci_host_bus_init(phb, ARGS);
@@
expression PHB, BUS;
expression list ARGS;
@@
pci_host_bus_init_inplace(PHB, BUS, ARGS);
...
-PHB->bus = BUS;
@@
typedef PCIHostState;
typedef PCIBus;
identifier phb, BUS;
@@
void pci_host_bus_init_inplace(PCIHostState *phb, PCIBus *BUS, ...)
{
...
+ phb->bus = BUS;
}
@@
identifier b;
expression phb;
expression list ARGS;
@@
-b = pci_host_bus_init_irqs(phb, ARGS);
+pci_host_bus_init_irqs(phb, ARGS);
+b = phb->bus;
...
-phb->bus = b;
@@
expression phb;
expression list ARGS;
@@
-phb->bus = pci_host_bus_init_irqs(phb, ARGS);
+pci_host_bus_init_irqs(phb, ARGS);
Cc: Alexander Graf <ag...@suse.de>
Cc: Aurelien Jarno <aurel...@aurel32.net>
Cc: Christian Borntraeger <borntrae...@de.ibm.com>
Cc: Cornelia Huck <cornelia.h...@de.ibm.com>
Cc: David Gibson <da...@gibson.dropbear.id.au>
Cc: "Hervé Poussineau" <hpous...@reactos.org>
Cc: Marcel Apfelbaum <mar...@redhat.com>
Cc: "Michael S. Tsirkin" <m...@redhat.com>
Cc: Paul Burton <paul.bur...@imgtec.com>
Cc: Peter Maydell <peter.mayd...@linaro.org>
Cc: Richard Henderson <r...@twiddle.net>
Cc: Scott Wood <scottw...@freescale.com>
Cc: Yongbok Kim <yongbok....@imgtec.com>
Cc: qemu-...@nongnu.org
Cc: qemu-...@nongnu.org
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
---
hw/alpha/typhoon.c | 8 ++++----
hw/mips/gt64xxx_pci.c | 8 +++-----
hw/pci-bridge/pci_expander_bridge.c | 12 ++++++------
hw/pci-host/apb.c | 6 ++----
hw/pci-host/bonito.c | 7 +++----
hw/pci-host/gpex.c | 7 +++----
hw/pci-host/grackle.c | 7 +++----
hw/pci-host/piix.c | 6 +++---
hw/pci-host/ppce500.c | 9 ++++-----
hw/pci-host/prep.c | 2 --
hw/pci-host/q35.c | 5 ++---
hw/pci-host/uninorth.c | 14 ++++++--------
hw/pci-host/versatile.c | 1 -
hw/pci-host/xilinx-pcie.c | 7 +++----
hw/pci/pci.c | 2 +-
hw/ppc/ppc4xx_pci.c | 9 ++++-----
hw/ppc/spapr_pci.c | 9 ++++-----
hw/s390x/s390-pci-bus.c | 9 ++++-----
hw/sh4/sh_pci.c | 7 +++----
19 files changed, 58 insertions(+), 77 deletions(-)
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 24f1959ab8..a35fac5381 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -883,10 +883,10 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus
**isa_bus,
memory_region_add_subregion(addr_space, 0x801fc000000ULL,
&s->pchip.reg_io);
- b = pci_host_bus_init_irqs(phb, "pci", typhoon_set_irq,
- sys_map_irq, s, &s->pchip.reg_mem,
- &s->pchip.reg_io, 0, 64, TYPE_PCI_BUS);
- phb->bus = b;
+ pci_host_bus_init_irqs(phb, "pci", typhoon_set_irq, sys_map_irq, s,
+ &s->pchip.reg_mem, &s->pchip.reg_io, 0, 64,
+ TYPE_PCI_BUS);
+ b = phb->bus;
qdev_init_nofail(dev);
/* Host memory as seen from the PCI side, via the IOMMU. */
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index 5ca9f07031..428d5e2dd9 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -1171,11 +1171,9 @@ PCIBus *gt64120_register(qemu_irq *pic)
phb = PCI_HOST_BRIDGE(dev);
memory_region_init(&d->pci0_mem, OBJECT(dev), "pci0-mem", UINT32_MAX);
address_space_init(&d->pci0_mem_as, &d->pci0_mem, "pci0-mem");
- phb->bus = pci_host_bus_init_irqs(phb, "pci",
- gt64120_pci_set_irq,
- gt64120_pci_map_irq, pic, &d->pci0_mem,
- get_system_io(), PCI_DEVFN(18, 0), 4,
- TYPE_PCI_BUS);
+ pci_host_bus_init_irqs(phb, "pci", gt64120_pci_set_irq,
+ gt64120_pci_map_irq, pic, &d->pci0_mem,
+ get_system_io(), PCI_DEVFN(18, 0), 4, TYPE_PCI_BUS);
qdev_init_nofail(dev);
memory_region_init_io(&d->ISD_mem, OBJECT(dev), &isd_mem_ops, d,
"isd-mem", 0x1000);
diff --git a/hw/pci-bridge/pci_expander_bridge.c
b/hw/pci-bridge/pci_expander_bridge.c
index 853448ef70..e88b0aa682 100644
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -230,11 +230,13 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool
pcie, Error **errp)
ds = qdev_create(NULL, TYPE_PXB_HOST);
if (pcie) {
- bus = pci_host_bus_init(PCI_HOST_BRIDGE(ds), dev_name, NULL, NULL, 0,
- TYPE_PXB_PCIE_BUS);
+ pci_host_bus_init(PCI_HOST_BRIDGE(ds), dev_name, NULL, NULL, 0,
+ TYPE_PXB_PCIE_BUS);
+ bus = PCI_HOST_BRIDGE(ds)->bus;
} else {
- bus = pci_host_bus_init(PCI_HOST_BRIDGE(ds), "pxb-internal", NULL,
- NULL, 0, TYPE_PXB_BUS);
+ pci_host_bus_init(PCI_HOST_BRIDGE(ds), "pxb-internal", NULL, NULL, 0,
+ TYPE_PXB_BUS);
+ bus = PCI_HOST_BRIDGE(ds)->bus;
bds = qdev_create(BUS(bus), "pci-bridge");
bds->id = dev_name;
qdev_prop_set_uint8(bds, PCI_BRIDGE_DEV_PROP_CHASSIS_NR, pxb->bus_nr);
@@ -246,8 +248,6 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool
pcie, Error **errp)
bus->address_space_io = dev->bus->address_space_io;
bus->map_irq = pxb_map_irq_fn;
- PCI_HOST_BRIDGE(ds)->bus = bus;
-
pxb_register_bus(dev, bus, &local_err);
if (local_err) {
error_propagate(errp, local_err);
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
index 38d08c661c..ebcb93d9ac 100644
--- a/hw/pci-host/apb.c
+++ b/hw/pci-host/apb.c
@@ -671,10 +671,8 @@ PCIBus *pci_apb_init(hwaddr special_base,
dev = qdev_create(NULL, TYPE_APB);
d = APB_DEVICE(dev);
phb = PCI_HOST_BRIDGE(dev);
- phb->bus = pci_host_bus_init_irqs(phb, "pci",
- pci_apb_set_irq, pci_pbm_map_irq, d,
- &d->pci_mmio, get_system_io(), 0, 32,
- TYPE_PCI_BUS);
+ pci_host_bus_init_irqs(phb, "pci", pci_apb_set_irq, pci_pbm_map_irq, d,
+ &d->pci_mmio, get_system_io(), 0, 32, TYPE_PCI_BUS);
qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(dev);
/* apb_config */
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 8b6e80aa82..ff3db73900 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -714,10 +714,9 @@ static int bonito_pcihost_initfn(SysBusDevice *dev)
{
PCIHostState *phb = PCI_HOST_BRIDGE(dev);
- phb->bus = pci_host_bus_init_irqs(phb, "pci",
- pci_bonito_set_irq, pci_bonito_map_irq,
- dev, get_system_memory(),
- get_system_io(), 0x28, 32, TYPE_PCI_BUS);
+ pci_host_bus_init_irqs(phb, "pci", pci_bonito_set_irq, pci_bonito_map_irq,
+ dev, get_system_memory(), get_system_io(), 0x28,
+ 32, TYPE_PCI_BUS);
return 0;
}
diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c
index 9ea9927cf8..9e5d2e2dc4 100644
--- a/hw/pci-host/gpex.c
+++ b/hw/pci-host/gpex.c
@@ -62,10 +62,9 @@ static void gpex_host_realize(DeviceState *dev, Error **errp)
sysbus_init_irq(sbd, &s->irq[i]);
}
- pci->bus = pci_host_bus_init_irqs(pci, "pcie.0",
- gpex_set_irq, pci_swizzle_map_irq_fn, s,
- &s->io_mmio, &s->io_ioport, 0, 4,
- TYPE_PCIE_BUS);
+ pci_host_bus_init_irqs(pci, "pcie.0", gpex_set_irq,
+ pci_swizzle_map_irq_fn, s, &s->io_mmio,
+ &s->io_ioport, 0, 4, TYPE_PCIE_BUS);
qdev_set_parent_bus(DEVICE(&s->gpex_root), BUS(pci->bus));
qdev_init_nofail(DEVICE(&s->gpex_root));
diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c
index 0844c30d9a..b3126852de 100644
--- a/hw/pci-host/grackle.c
+++ b/hw/pci-host/grackle.c
@@ -82,10 +82,9 @@ PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic,
memory_region_add_subregion(address_space_mem, 0x80000000ULL,
&d->pci_hole);
- phb->bus = pci_host_bus_init_irqs(phb, NULL,
- pci_grackle_set_irq,
- pci_grackle_map_irq, pic, &d->pci_mmio,
- address_space_io, 0, 4, TYPE_PCI_BUS);
+ pci_host_bus_init_irqs(phb, NULL, pci_grackle_set_irq,
+ pci_grackle_map_irq, pic, &d->pci_mmio,
+ address_space_io, 0, 4, TYPE_PCI_BUS);
pci_create_simple(phb->bus, 0, "grackle");
qdev_init_nofail(dev);
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 364d57039b..ec5a39706e 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -340,9 +340,9 @@ PCIBus *i440fx_init(const char *host_type, const char
*pci_type,
dev = qdev_create(NULL, host_type);
s = PCI_HOST_BRIDGE(dev);
- b = pci_host_bus_init(s, NULL, pci_address_space,
- address_space_io, 0, TYPE_PCI_BUS);
- s->bus = b;
+ pci_host_bus_init(s, NULL, pci_address_space, address_space_io, 0,
+ TYPE_PCI_BUS);
+ b = s->bus;
object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), NULL);
qdev_init_nofail(dev);
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index babb12af31..d7091709d2 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -465,11 +465,10 @@ static int e500_pcihost_initfn(SysBusDevice *dev)
/* PIO lives at the bottom of our bus space */
memory_region_add_subregion_overlap(&s->busmem, 0, &s->pio, -2);
- b = pci_host_bus_init_irqs(h, NULL,
- mpc85xx_pci_set_irq, mpc85xx_pci_map_irq, s,
- &s->busmem, &s->pio,
- PCI_DEVFN(s->first_slot, 0), 4, TYPE_PCI_BUS);
- h->bus = b;
+ pci_host_bus_init_irqs(h, NULL, mpc85xx_pci_set_irq, mpc85xx_pci_map_irq,
+ s, &s->busmem, &s->pio,
+ PCI_DEVFN(s->first_slot, 0), 4, TYPE_PCI_BUS);
+ b = h->bus;
/* Set up PCI view of memory */
memory_region_init(&s->bm, OBJECT(s), "bm-e500", UINT64_MAX);
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index 65add936c7..da151fc051 100644
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -285,8 +285,6 @@ static void raven_pcihost_initfn(Object *obj)
address_space_init(&s->bm_as, &s->bm, "raven-bm");
pci_setup_iommu(&s->pci_bus, raven_pcihost_set_iommu, s);
- h->bus = &s->pci_bus;
-
object_initialize(&s->pci_dev, sizeof(s->pci_dev), TYPE_RAVEN_PCI_DEVICE);
pci_dev = DEVICE(&s->pci_dev);
qdev_set_parent_bus(pci_dev, BUS(&s->pci_bus));
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 4258076979..c285d2caca 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -49,9 +49,8 @@ static void q35_host_realize(DeviceState *dev, Error **errp)
sysbus_add_io(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, &pci->data_mem);
sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, 4);
- pci->bus = pci_host_bus_init(pci, "pcie.0",
- s->mch.pci_address_space,
- s->mch.address_space_io, 0, TYPE_PCIE_BUS);
+ pci_host_bus_init(pci, "pcie.0", s->mch.pci_address_space,
+ s->mch.address_space_io, 0, TYPE_PCIE_BUS);
PC_MACHINE(qdev_get_machine())->bus = pci->bus;
qdev_set_parent_bus(DEVICE(&s->mch), BUS(pci->bus));
qdev_init_nofail(DEVICE(&s->mch));
diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
index d9fb5fdc93..febabeaec7 100644
--- a/hw/pci-host/uninorth.c
+++ b/hw/pci-host/uninorth.c
@@ -233,10 +233,9 @@ PCIBus *pci_pmac_init(qemu_irq *pic,
memory_region_add_subregion(address_space_mem, 0x80000000ULL,
&d->pci_hole);
- h->bus = pci_host_bus_init_irqs(h, NULL,
- pci_unin_set_irq, pci_unin_map_irq, pic,
- &d->pci_mmio, address_space_io,
- PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS);
+ pci_host_bus_init_irqs(h, NULL, pci_unin_set_irq, pci_unin_map_irq, pic,
+ &d->pci_mmio, address_space_io, PCI_DEVFN(11, 0),
+ 4, TYPE_PCI_BUS);
#if 0
pci_create_simple(h->bus, PCI_DEVFN(11, 0), "uni-north");
@@ -297,10 +296,9 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic,
memory_region_add_subregion(address_space_mem, 0x80000000ULL,
&d->pci_hole);
- h->bus = pci_host_bus_init_irqs(h, NULL,
- pci_unin_set_irq, pci_unin_map_irq, pic,
- &d->pci_mmio, address_space_io,
- PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS);
+ pci_host_bus_init_irqs(h, NULL, pci_unin_set_irq, pci_unin_map_irq, pic,
+ &d->pci_mmio, address_space_io, PCI_DEVFN(11, 0),
+ 4, TYPE_PCI_BUS);
sysbus_mmio_map(s, 0, 0xf0800000);
sysbus_mmio_map(s, 1, 0xf0c00000);
diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index cad8848723..caf7f6407a 100644
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -390,7 +390,6 @@ static void pci_vpb_init(Object *obj)
sizeof(s->pci_bus), "pci", &s->pci_mem_space,
&s->pci_io_space, PCI_DEVFN(11, 0),
TYPE_PCI_BUS);
- h->bus = &s->pci_bus;
object_initialize(&s->pci_dev, sizeof(s->pci_dev),
TYPE_VERSATILE_PCI_HOST);
qdev_set_parent_bus(DEVICE(&s->pci_dev), BUS(&s->pci_bus));
diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c
index 0a3d19b22c..f988c7e58e 100644
--- a/hw/pci-host/xilinx-pcie.c
+++ b/hw/pci-host/xilinx-pcie.c
@@ -129,10 +129,9 @@ static void xilinx_pcie_host_realize(DeviceState *dev,
Error **errp)
sysbus_init_mmio(sbd, &pex->mmio);
sysbus_init_mmio(sbd, &s->mmio);
- pci->bus = pci_host_bus_init_irqs(pci, s->name,
- xilinx_pcie_set_irq,
- pci_swizzle_map_irq_fn, s, &s->mmio,
- &s->io, 0, 4, TYPE_PCIE_BUS);
+ pci_host_bus_init_irqs(pci, s->name, xilinx_pcie_set_irq,
+ pci_swizzle_map_irq_fn, s, &s->mmio, &s->io, 0, 4,
+ TYPE_PCIE_BUS);
qdev_set_parent_bus(DEVICE(&s->root), BUS(pci->bus));
qdev_init_nofail(DEVICE(&s->root));
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 37d65eaf7e..dd065a0881 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -384,7 +384,7 @@ void pci_host_bus_init_inplace(PCIHostState *phb, PCIBus
*bus,
QLIST_INIT(&bus->child);
QLIST_INSERT_HEAD(&pci_host_bridges, phb, next);
-
+ phb->bus = bus;
}
PCIBus *pci_host_bus_init(PCIHostState *phb, const char *name,
diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index 0d767a1a23..992be1bce9 100644
--- a/hw/ppc/ppc4xx_pci.c
+++ b/hw/ppc/ppc4xx_pci.c
@@ -314,11 +314,10 @@ static int ppc4xx_pcihost_initfn(SysBusDevice *dev)
sysbus_init_irq(dev, &s->irq[i]);
}
- b = pci_host_bus_init_irqs(h, NULL,
- ppc4xx_pci_set_irq, ppc4xx_pci_map_irq, s->irq,
- get_system_memory(), get_system_io(), 0, 4,
- TYPE_PCI_BUS);
- h->bus = b;
+ pci_host_bus_init_irqs(h, NULL, ppc4xx_pci_set_irq, ppc4xx_pci_map_irq,
+ s->irq, get_system_memory(), get_system_io(), 0, 4,
+ TYPE_PCI_BUS);
+ b = h->bus;
pci_create_simple(b, 0, "ppc4xx-host-bridge");
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index ce132c5eea..06e8a8740b 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1697,11 +1697,10 @@ static void spapr_phb_realize(DeviceState *dev, Error
**errp)
memory_region_add_subregion(get_system_memory(), sphb->io_win_addr,
&sphb->iowindow);
- bus = pci_host_bus_init_irqs(phb, NULL,
- pci_spapr_set_irq, pci_spapr_map_irq, sphb,
- &sphb->memspace, &sphb->iospace,
- PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS);
- phb->bus = bus;
+ pci_host_bus_init_irqs(phb, NULL, pci_spapr_set_irq, pci_spapr_map_irq,
+ sphb, &sphb->memspace, &sphb->iospace,
+ PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS);
+ bus = phb->bus;
qbus_set_hotplug_handler(BUS(phb->bus), DEVICE(sphb), NULL);
/*
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 267e1de510..5e174e90f4 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -560,15 +560,14 @@ static int s390_pcihost_init(SysBusDevice *dev)
DPRINTF("host_init\n");
- b = pci_host_bus_init_irqs(phb, NULL,
- s390_pci_set_irq, s390_pci_map_irq, NULL,
- get_system_memory(), get_system_io(), 0, 64,
- TYPE_PCI_BUS);
+ pci_host_bus_init_irqs(phb, NULL, s390_pci_set_irq, s390_pci_map_irq,
+ NULL, get_system_memory(), get_system_io(), 0, 64,
+ TYPE_PCI_BUS);
+ b = phb->bus;
pci_setup_iommu(b, s390_pci_dma_iommu, s);
bus = BUS(b);
qbus_set_hotplug_handler(bus, DEVICE(dev), NULL);
- phb->bus = b;
s->bus = S390_PCI_BUS(qbus_create(TYPE_S390_PCI_BUS, DEVICE(s), NULL));
qbus_set_hotplug_handler(BUS(s->bus), DEVICE(s), NULL);
diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c
index 8be2e830e9..5745738fb9 100644
--- a/hw/sh4/sh_pci.c
+++ b/hw/sh4/sh_pci.c
@@ -131,10 +131,9 @@ static int sh_pci_device_init(SysBusDevice *dev)
for (i = 0; i < 4; i++) {
sysbus_init_irq(dev, &s->irq[i]);
}
- phb->bus = pci_host_bus_init_irqs(phb, "pci",
- sh_pci_set_irq, sh_pci_map_irq, s->irq,
- get_system_memory(), get_system_io(),
- PCI_DEVFN(0, 0), 4, TYPE_PCI_BUS);
+ pci_host_bus_init_irqs(phb, "pci", sh_pci_set_irq, sh_pci_map_irq, s->irq,
+ get_system_memory(), get_system_io(),
+ PCI_DEVFN(0, 0), 4, TYPE_PCI_BUS);
memory_region_init_io(&s->memconfig_p4, OBJECT(s), &sh_pci_reg_ops, s,
"sh_pci", 0x224);
memory_region_init_alias(&s->memconfig_a7, OBJECT(s), "sh_pci.2",
--
2.11.0.259.g40922b1
