pci: Add interface names to hybrid PCI devices
The following devices support both PCI Express and Conventional PCI, by including special code to handle the QEMU_PCI_CAP_EXPRESS flag and/or conditional pcie_endpoint_cap_init() calls: * vfio-pci (is_express=1, but legacy PCI handled by vfio_populate_device()) * vmxnet3 (is_express=0, but PCIe handled by vmxnet3_realize()) * pvscsi (is_express=0, but PCIe handled by pvscsi_realize()) * virtio-pci (is_express=0, but PCIe handled by virtio_pci_dc_realize(), and additional legacy PCI code at virtio_pci_realize()) * base-xhci (is_express=1, but pcie_endpoint_cap_init() call is conditional on pci_bus_is_express(dev->bus) * Note that xhci does not clear QEMU_PCI_CAP_EXPRESS like the other hybrid devices Cc: Dmitry Fleytman <dmitry@daynix.com> Cc: Jason Wang <jasowang@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Alex Williamson <alex.williamson@redhat.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
619f02aefc
commit
a5fa336f11
@ -2653,6 +2653,11 @@ static const TypeInfo vmxnet3_info = {
|
|||||||
.instance_size = sizeof(VMXNET3State),
|
.instance_size = sizeof(VMXNET3State),
|
||||||
.class_init = vmxnet3_class_init,
|
.class_init = vmxnet3_class_init,
|
||||||
.instance_init = vmxnet3_instance_init,
|
.instance_init = vmxnet3_instance_init,
|
||||||
|
.interfaces = (InterfaceInfo[]) {
|
||||||
|
{ INTERFACE_PCIE_DEVICE },
|
||||||
|
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
|
||||||
|
{ }
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static void vmxnet3_register_types(void)
|
static void vmxnet3_register_types(void)
|
||||||
|
@ -1302,6 +1302,8 @@ static const TypeInfo pvscsi_info = {
|
|||||||
.class_init = pvscsi_class_init,
|
.class_init = pvscsi_class_init,
|
||||||
.interfaces = (InterfaceInfo[]) {
|
.interfaces = (InterfaceInfo[]) {
|
||||||
{ TYPE_HOTPLUG_HANDLER },
|
{ TYPE_HOTPLUG_HANDLER },
|
||||||
|
{ INTERFACE_PCIE_DEVICE },
|
||||||
|
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
|
||||||
{ }
|
{ }
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -3670,6 +3670,11 @@ static const TypeInfo xhci_info = {
|
|||||||
.instance_size = sizeof(XHCIState),
|
.instance_size = sizeof(XHCIState),
|
||||||
.class_init = xhci_class_init,
|
.class_init = xhci_class_init,
|
||||||
.abstract = true,
|
.abstract = true,
|
||||||
|
.interfaces = (InterfaceInfo[]) {
|
||||||
|
{ INTERFACE_PCIE_DEVICE },
|
||||||
|
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
|
||||||
|
{ }
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static void qemu_xhci_class_init(ObjectClass *klass, void *data)
|
static void qemu_xhci_class_init(ObjectClass *klass, void *data)
|
||||||
|
@ -3036,6 +3036,11 @@ static const TypeInfo vfio_pci_dev_info = {
|
|||||||
.class_init = vfio_pci_dev_class_init,
|
.class_init = vfio_pci_dev_class_init,
|
||||||
.instance_init = vfio_instance_init,
|
.instance_init = vfio_instance_init,
|
||||||
.instance_finalize = vfio_instance_finalize,
|
.instance_finalize = vfio_instance_finalize,
|
||||||
|
.interfaces = (InterfaceInfo[]) {
|
||||||
|
{ INTERFACE_PCIE_DEVICE },
|
||||||
|
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
|
||||||
|
{ }
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static void register_vfio_pci_dev_type(void)
|
static void register_vfio_pci_dev_type(void)
|
||||||
|
@ -1904,6 +1904,11 @@ static const TypeInfo virtio_pci_info = {
|
|||||||
.class_init = virtio_pci_class_init,
|
.class_init = virtio_pci_class_init,
|
||||||
.class_size = sizeof(VirtioPCIClass),
|
.class_size = sizeof(VirtioPCIClass),
|
||||||
.abstract = true,
|
.abstract = true,
|
||||||
|
.interfaces = (InterfaceInfo[]) {
|
||||||
|
{ INTERFACE_PCIE_DEVICE },
|
||||||
|
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
|
||||||
|
{ }
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
/* virtio-blk-pci */
|
/* virtio-blk-pci */
|
||||||
|
Loading…
Reference in New Issue
Block a user