[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/26] pci: Validate interfaces on base_class_init
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 20/26] pci: Validate interfaces on base_class_init |
Date: |
Sun, 15 Oct 2017 06:23:54 +0300 |
From: Eduardo Habkost <address@hidden>
Make sure we don't forget to add the Conventional PCI or PCI
Express interface names on PCI device classes in the future.
Signed-off-by: Eduardo Habkost <address@hidden>
Revieed-by: David Gibson <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pci/pci.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 1b08e18..5ed3c8d 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2547,6 +2547,17 @@ static void pci_device_class_init(ObjectClass *klass,
void *data)
pc->realize = pci_default_realize;
}
+static void pci_device_class_base_init(ObjectClass *klass, void *data)
+{
+ if (!object_class_is_abstract(klass)) {
+ ObjectClass *conventional =
+ object_class_dynamic_cast(klass,
INTERFACE_CONVENTIONAL_PCI_DEVICE);
+ ObjectClass *pcie =
+ object_class_dynamic_cast(klass, INTERFACE_PCIE_DEVICE);
+ assert(conventional || pcie);
+ }
+}
+
AddressSpace *pci_device_iommu_address_space(PCIDevice *dev)
{
PCIBus *bus = PCI_BUS(dev->bus);
@@ -2671,6 +2682,7 @@ static const TypeInfo pci_device_type_info = {
.abstract = true,
.class_size = sizeof(PCIDeviceClass),
.class_init = pci_device_class_init,
+ .class_base_init = pci_device_class_base_init,
};
static void pci_register_types(void)
--
MST
- [Qemu-devel] [PULL 09/26] MAINTAINERS: add Dump maintainers, (continued)
- [Qemu-devel] [PULL 09/26] MAINTAINERS: add Dump maintainers, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 10/26] virtio/vhost: reset dev->log after syncing, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 11/26] pci: allow 32-bit PCI IO accesses to pass through the PCI bridge, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 12/26] hw/pci-bridge/pcie_pci_bridge: properly handle MSI unavailability case, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 13/26] virtio/pci/migration: Convert to VMState, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 14/26] PCI: PCIe access should always be little endian, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 15/26] pci: conventional-pci-device and pci-express-device interfaces, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 16/26] pci: Add interface names to hybrid PCI devices, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 17/26] pci: Add INTERFACE_PCIE_DEVICE to all PCIe devices, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 19/26] xen/pt: Mark TYPE_XEN_PT_DEVICE as hybrid, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 20/26] pci: Validate interfaces on base_class_init,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 21/26] hw/gen_pcie_root_port: make IO RO 0 on IO disabled, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 22/26] virtio: fix descriptor counting in virtqueue_pop, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 24/26] isapc: Remove unnecessary migration compatibility code, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 23/26] virtio-pci: Replace modern_as with direct access to modern_bar, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 25/26] pc: remove useless hot_add_cpu initialisation, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 26/26] tests/pxe: Test more NICs when running in SPEED=slow mode, Michael S. Tsirkin, 2017/10/14
- [Qemu-devel] [PULL 18/26] pci: Add INTERFACE_CONVENTIONAL_PCI_DEVICE to Conventional PCI devices, Michael S. Tsirkin, 2017/10/14
- Re: [Qemu-devel] [PULL 00/26] pc, pci, virtio: fixes, features, Peter Maydell, 2017/10/16