diff options
| author | David Gibson | 2017-11-29 09:46:22 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2017-12-05 18:13:45 +0100 |
| commit | 1115ff6d268bba163a183e8d63cec6b687cc5fc7 (patch) | |
| tree | ab3898aee356a6a4cf02a84095a82a1f5e7f8875 /hw/pci-bridge/pci_expander_bridge.c | |
| parent | tests: add test to check VirtQueue object (diff) | |
| download | qemu-1115ff6d268bba163a183e8d63cec6b687cc5fc7.tar.gz qemu-1115ff6d268bba163a183e8d63cec6b687cc5fc7.tar.xz qemu-1115ff6d268bba163a183e8d63cec6b687cc5fc7.zip | |
pci: Rename root bus initialization functions for clarity
pci_bus_init(), pci_bus_new_inplace(), pci_bus_new() and pci_register_bus()
are misleadingly named. They're not used for initializing *any* PCI bus,
but only for a root PCI bus.
Non-root buses - i.e. ones under a logical PCI to PCI bridge - are instead
created with a direct qbus_create_inplace() (see pci_bridge_initfn()).
This patch renames the functions to make it clear they're only used for
a root bus.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Diffstat (limited to 'hw/pci-bridge/pci_expander_bridge.c')
| -rw-r--r-- | hw/pci-bridge/pci_expander_bridge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c index 8c8ac737ad..b2fa829e29 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -230,9 +230,9 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool pcie, Error **errp) ds = qdev_create(NULL, TYPE_PXB_HOST); if (pcie) { - bus = pci_bus_new(ds, dev_name, NULL, NULL, 0, TYPE_PXB_PCIE_BUS); + bus = pci_root_bus_new(ds, dev_name, NULL, NULL, 0, TYPE_PXB_PCIE_BUS); } else { - bus = pci_bus_new(ds, "pxb-internal", NULL, NULL, 0, TYPE_PXB_BUS); + bus = pci_root_bus_new(ds, "pxb-internal", NULL, NULL, 0, TYPE_PXB_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); |