Every single caller of pci_bus_new_inplace() sets phb->bus to point to 'bus'. Do that inside pci_bus_new_inplace() to avoid code duplication and make it harder to break.
Cc: "Hervé Poussineau" <hpous...@reactos.org> Cc: Marcel Apfelbaum <mar...@redhat.com> Cc: "Michael S. Tsirkin" <m...@redhat.com> Cc: Peter Maydell <peter.mayd...@linaro.org> Cc: qemu-...@nongnu.org Cc: qemu-...@nongnu.org Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- hw/pci-host/prep.c | 2 -- hw/pci-host/versatile.c | 1 - hw/pci/pci.c | 1 + 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 2e2cd267f4..6efa5bc5ef 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -284,8 +284,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/versatile.c b/hw/pci-host/versatile.c index 24ef87610b..630f1ac1c5 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -389,7 +389,6 @@ static void pci_vpb_init(Object *obj) pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), h, "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/pci.c b/hw/pci/pci.c index 486aeb7514..ef226f8b41 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -397,6 +397,7 @@ void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, { qbus_create_inplace(bus, bus_size, typename, DEVICE(phb), name); pci_bus_init(bus, phb, address_space_mem, address_space_io, devfn_min); + phb->bus = bus; } PCIBus *pci_bus_new(PCIHostState *phb, const char *name, -- 2.11.0.259.g40922b1