[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 17/20] pci: Set device_type on bus classes
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC v2 17/20] pci: Set device_type on bus classes |
Date: |
Fri, 25 Nov 2016 20:05:53 -0200 |
The default device_type for for TYPE_PCI_BUS will be
INTERFACE_LEGACY_PCI_DEVICE. The device_type for TYPE_PCIE_BUS
will be INTERFACE_PCIE_DEVICE.
Note that specific bus instances may still override
accepted_device_types. See the comments added to the code.
Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes series v1 -> v2:
* (new patch added to series)
---
hw/pci/pci.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 2fc543c..19dc63a 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -152,7 +152,10 @@ static void pci_bus_class_init(ObjectClass *klass, void
*data)
k->realize = pci_bus_realize;
k->unrealize = pci_bus_unrealize;
k->reset = pcibus_reset;
- k->device_type = TYPE_PCI_DEVICE;
+ /* note that TYPE_PCIE_BUS is a TYPE_PCI_BUS subclass,
+ * but overrides BusClass::device_type to INTERFACE_PCIE_DEVICE
+ */
+ k->device_type = INTERFACE_LEGACY_PCI_DEVICE;
pbc->is_root = pcibus_is_root;
pbc->bus_num = pcibus_num;
@@ -177,8 +180,19 @@ static const TypeInfo legacy_pci_interface_info = {
.parent = TYPE_INTERFACE,
};
+static void pcie_bus_class_init(ObjectClass *oc, void *opaque)
+{
+ BusClass *bc = BUS_CLASS(oc);
+ /* Note that this is the default value for accepted_device_types,
+ * but specific PCIe bus instances may override it.
+ * (e.g. q35 root bus accepts both legacy and PCIe devices).
+ */
+ bc->device_type = INTERFACE_PCIE_DEVICE;
+}
+
static const TypeInfo pcie_bus_info = {
.name = TYPE_PCIE_BUS,
+ .class_init = pcie_bus_class_init,
.parent = TYPE_PCI_BUS,
};
--
2.7.4
- Re: [Qemu-devel] [RFC v2 06/20] qdev: Add 'accepted-device-types' property to BusClass, (continued)
- [Qemu-devel] [RFC v2 08/20] virtio-pci: Set PCIDeviceClass::is_express=1, Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 07/20] qmp: Add 'always-available-buses' field to 'query-machines', Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 09/20] vmxnet3: Set PCIDeviceClass::is_express=1, Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 10/20] pvscsi: Set PCIDeviceClass::is_express=1, Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 11/20] pci: INTERFACE_LEGACY_PCI_DEVICE and INTERFACE_PCIE_DEVICE interfaces, Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 13/20] [trivial] edu: Move edu_info outside function, Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 12/20] pci: Replace is_express with INTERFACE_PCIE_DEVICE, Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 15/20] eepro100: Add INTERFACE_LEGACY_PCI_DEVICE, Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 16/20] [incomplete] remove INTERFACE_LEGACY_PCI_DEVICE from PCIe-only devices, Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 17/20] pci: Set device_type on bus classes,
Eduardo Habkost <=
- [Qemu-devel] [RFC v2 14/20] [automated] Add INTERFACE_LEGACY_PCI_DEVICE to all PCI device subclasses, Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 18/20] q35: Hack to make root bus accept legacy PCI devices, Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 19/20] pci: validate interfaces on base_class_init, Eduardo Habkost, 2016/11/25
- [Qemu-devel] [RFC v2 20/20] pc: Initialize default bus lists, Eduardo Habkost, 2016/11/25
- Re: [Qemu-devel] [libvirt] [RFC v2 00/20] qmp: Report bus information on 'query-machines', no-reply, 2016/11/29
- Re: [Qemu-devel] [libvirt] [RFC v2 00/20] qmp: Report bus information on 'query-machines', no-reply, 2016/11/29
- Re: [Qemu-devel] [RFC v2 00/20] qmp: Report bus information on 'query-machines', Eduardo Habkost, 2016/11/29