[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V8 02/17] hw/pci: made pci_bus_is_root a PCIBusClass
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH V8 02/17] hw/pci: made pci_bus_is_root a PCIBusClass method |
Date: |
Tue, 2 Jun 2015 14:22:57 +0300 |
From: Marcel Apfelbaum <address@hidden>
Refactoring it as a method of PCIBusClass will allow
different implementations for subclasses.
Removed the assumption that the root bus does not
have a parent device because is specific only
to the default class implementation.
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/pci/pci.c | 17 ++++++++++++++---
include/hw/pci/pci.h | 2 ++
include/hw/pci/pci_bus.h | 8 ++++++++
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 48f19a3..132d19e 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -88,9 +88,15 @@ static void pci_bus_unrealize(BusState *qbus, Error **errp)
vmstate_unregister(NULL, &vmstate_pcibus, bus);
}
+static bool pcibus_is_root(PCIBus *bus)
+{
+ return !bus->parent_dev;
+}
+
static void pci_bus_class_init(ObjectClass *klass, void *data)
{
BusClass *k = BUS_CLASS(klass);
+ PCIBusClass *pbc = PCI_BUS_CLASS(klass);
k->print_dev = pcibus_dev_print;
k->get_dev_path = pcibus_get_dev_path;
@@ -98,12 +104,15 @@ static void pci_bus_class_init(ObjectClass *klass, void
*data)
k->realize = pci_bus_realize;
k->unrealize = pci_bus_unrealize;
k->reset = pcibus_reset;
+
+ pbc->is_root = pcibus_is_root;
}
static const TypeInfo pci_bus_info = {
.name = TYPE_PCI_BUS,
.parent = TYPE_BUS,
.instance_size = sizeof(PCIBus),
+ .class_size = sizeof(PCIBusClass),
.class_init = pci_bus_class_init,
};
@@ -278,7 +287,10 @@ PCIBus *pci_device_root_bus(const PCIDevice *d)
{
PCIBus *bus = d->bus;
- while ((d = bus->parent_dev) != NULL) {
+ while (!pci_bus_is_root(bus)) {
+ d = bus->parent_dev;
+ assert(d != NULL);
+
bus = d->bus;
}
@@ -291,7 +303,6 @@ const char *pci_root_bus_path(PCIDevice *dev)
PCIHostState *host_bridge = PCI_HOST_BRIDGE(rootbus->qbus.parent);
PCIHostBridgeClass *hc = PCI_HOST_BRIDGE_GET_CLASS(host_bridge);
- assert(!rootbus->parent_dev);
assert(host_bridge->bus == rootbus);
if (hc->root_bus_path) {
@@ -325,7 +336,7 @@ bool pci_bus_is_express(PCIBus *bus)
bool pci_bus_is_root(PCIBus *bus)
{
- return !bus->parent_dev;
+ return PCI_BUS_GET_CLASS(bus)->is_root(bus);
}
void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, DeviceState *parent,
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 5d050c8..df05c96 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -340,6 +340,8 @@ typedef PCIINTxRoute (*pci_route_irq_fn)(void *opaque, int
pin);
#define TYPE_PCI_BUS "PCI"
#define PCI_BUS(obj) OBJECT_CHECK(PCIBus, (obj), TYPE_PCI_BUS)
+#define PCI_BUS_CLASS(klass) OBJECT_CLASS_CHECK(PCIBusClass, (klass),
TYPE_PCI_BUS)
+#define PCI_BUS_GET_CLASS(obj) OBJECT_GET_CLASS(PCIBusClass, (obj),
TYPE_PCI_BUS)
#define TYPE_PCIE_BUS "PCIE"
bool pci_bus_is_express(PCIBus *bus);
diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h
index fabaeee..b5ba9c4 100644
--- a/include/hw/pci/pci_bus.h
+++ b/include/hw/pci/pci_bus.h
@@ -8,6 +8,14 @@
* use accessor functions in pci.h, pci_bridge.h
*/
+typedef struct PCIBusClass {
+ /*< private >*/
+ BusClass parent_class;
+ /*< public >*/
+
+ bool (*is_root)(PCIBus *bus);
+} PCIBusClass;
+
struct PCIBus {
BusState qbus;
PCIIOMMUFunc iommu_fn;
--
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 <=
- [Qemu-devel] [PATCH V8 03/17] hw/pci: made pci_bus_num a PCIBusClass method, Marcel Apfelbaum, 2015/06/02
- [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