[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V8 03/17] hw/pci: made pci_bus_num a PCIBusClass met
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH V8 03/17] hw/pci: made pci_bus_num a PCIBusClass method |
Date: |
Tue, 2 Jun 2015 14:22:58 +0300 |
From: Marcel Apfelbaum <address@hidden>
Refactoring it as a method of PCIBusClass will allow
different implementations for subclasses.
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/pci/pci.c | 13 ++++++++++---
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 132d19e..2f24f74 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 b5ba9c4..7b9939e 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 {
--
2.1.0
- [Qemu-devel] [PATCH V8 00/17] hw/pc: implement multiple primary busses for pc machines, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 01/17] acpi: add implementation of aml_while() term, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 02/17] hw/pci: made pci_bus_is_root a PCIBusClass method, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 03/17] hw/pci: made pci_bus_num a PCIBusClass method,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH V8 04/17] hw/i386: query only for q35/pc when looking for pci host bridge, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 05/17] hw/pci: extend PCI config access to support devices behind PXB, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 06/17] hw/acpi: add support for i440fx 'snooping' root busses, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 07/17] hw/apci: add _PRT method for extra PCI root busses, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 08/17] hw/acpi: add _CRS method for extra root busses, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 10/17] hw/pci: removed 'rootbus nr is 0' assumption from qmp_pci_query, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 09/17] hw/acpi: remove from root bus 0 the crs resources used by other buses., Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 12/17] hw/pci: inform bios if the system has extra pci root buses, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 13/17] hw/pxb: add map_irq func, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 11/17] hw/pci: introduce PCI Expander Bridge (PXB), Marcel Apfelbaum, 2015/06/02