From e4794a20f02368af6260ed3b4d9e040b41734459 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Fri, 20 Oct 2017 18:29:12 +0200 Subject: [PATCH 07/19] pci: conventional-pci-device and pci-express-device interfaces RH-Author: Eduardo Habkost Message-id: <20171020182917.10771-3-ehabkost@redhat.com> Patchwork-id: 77422 O-Subject: [RHV7.5 qemu-kvm-rhev PATCH v2 2/7] pci: conventional-pci-device and pci-express-device interfaces Bugzilla: 1390348 RH-Acked-by: Marcel Apfelbaum RH-Acked-by: Michael S. Tsirkin RH-Acked-by: Laurent Vivier Those two interfaces will be used to indicate which device types support Conventional PCI or PCI Express buses. Management software will be able to use the qom-list-types QMP command to query that information. Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson Reviewed-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 619f02aefc587e5e2821cd84b584eba199c97c9e) Signed-off-by: Eduardo Habkost Signed-off-by: Miroslav Rezanina --- hw/pci/pci.c | 12 ++++++++++++ include/hw/pci/pci.h | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 258fbe5..1226696 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -168,6 +168,16 @@ static const TypeInfo pci_bus_info = { .class_init = pci_bus_class_init, }; +static const TypeInfo pcie_interface_info = { + .name = INTERFACE_PCIE_DEVICE, + .parent = TYPE_INTERFACE, +}; + +static const TypeInfo conventional_pci_interface_info = { + .name = INTERFACE_CONVENTIONAL_PCI_DEVICE, + .parent = TYPE_INTERFACE, +}; + static const TypeInfo pcie_bus_info = { .name = TYPE_PCIE_BUS, .parent = TYPE_PCI_BUS, @@ -2645,6 +2655,8 @@ static void pci_register_types(void) { type_register_static(&pci_bus_info); type_register_static(&pcie_bus_info); + type_register_static(&conventional_pci_interface_info); + type_register_static(&pcie_interface_info); type_register_static(&pci_device_type_info); } diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index e598b09..cc6f5d2 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -195,6 +195,12 @@ enum { #define PCI_DEVICE_GET_CLASS(obj) \ OBJECT_GET_CLASS(PCIDeviceClass, (obj), TYPE_PCI_DEVICE) +/* Implemented by devices that can be plugged on PCI Express buses */ +#define INTERFACE_PCIE_DEVICE "pci-express-device" + +/* Implemented by devices that can be plugged on Conventional PCI buses */ +#define INTERFACE_CONVENTIONAL_PCI_DEVICE "conventional-pci-device" + typedef struct PCIINTxRoute { enum { PCI_INTX_ENABLED, -- 1.8.3.1