diff options
| author | Marcel Apfelbaum <marcel.a@redhat.com> | 2015-06-02 14:22:58 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-06-03 18:19:16 +0200 |
| commit | 602141d9974d726063907851528c89d617730156 (patch) | |
| tree | 98d94feb225a49f61cf3b87b43f91a1eea308381 | |
| parent | ce6a28ee057da3e4a587dada369e33a8486b0066 (diff) | |
| download | qemu-602141d9974d726063907851528c89d617730156.zip | |
hw/pci: made pci_bus_num a PCIBusClass method
Refactoring it as a method of PCIBusClass will allow
different implementations for subclasses.
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
| -rw-r--r-- | hw/pci/pci.c | 13 | ||||
| -rw-r--r-- | include/hw/pci/pci_bus.h | 1 |
2 files changed, 11 insertions, 3 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 132d19ec2a..2f24f74cf8 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -93,6 +93,14 @@ static bool pcibus_is_root(PCIBus *bus) return !bus->parent_dev; } +static int pcibus_num(PCIBus *bus) +{ + if (pcibus_is_root(bus)) { + return 0; /* pci host bridge */ + } + return bus->parent_dev->config[PCI_SECONDARY_BUS]; +} + static void pci_bus_class_init(ObjectClass *klass, void *data) { BusClass *k = BUS_CLASS(klass); @@ -106,6 +114,7 @@ static void pci_bus_class_init(ObjectClass *klass, void *data) k->reset = pcibus_reset; pbc->is_root = pcibus_is_root; + pbc->bus_num = pcibus_num; } static const TypeInfo pci_bus_info = { @@ -390,9 +399,7 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name, int pci_bus_num(PCIBus *s) { - if (pci_bus_is_root(s)) - return 0; /* pci host bridge */ - return s->parent_dev->config[PCI_SECONDARY_BUS]; + return PCI_BUS_GET_CLASS(s)->bus_num(s); } static int get_pci_config_device(QEMUFile *f, void *pv, size_t size) diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h index b5ba9c4a98..7b9939e346 100644 --- a/include/hw/pci/pci_bus.h +++ b/include/hw/pci/pci_bus.h @@ -14,6 +14,7 @@ typedef struct PCIBusClass { /*< public >*/ bool (*is_root)(PCIBus *bus); + int (*bus_num)(PCIBus *bus); } PCIBusClass; struct PCIBus { |