Commit 2fefa16c authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

pci: Validate interfaces on base_class_init 



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: default avatarEduardo Habkost <ehabkost@redhat.com>
Revieed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 6d702376

hw/pci/pci.c

+12 −0
Original line number Diff line number Diff line
@@ -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)