From 54ed98827de5ad796b429aa2163d039cbf242c39 Mon Sep 17 00:00:00 2001

From: Eduardo Habkost <ehabkost@redhat.com>

Date: Fri, 20 Oct 2017 18:29:15 +0200

Subject: [PATCH 10/19] pci: Add INTERFACE_CONVENTIONAL_PCI_DEVICE to

 Conventional PCI devices

RH-Author: Eduardo Habkost <ehabkost@redhat.com>

Message-id: <20171020182917.10771-6-ehabkost@redhat.com>

Patchwork-id: 77424

O-Subject: [RHV7.5 qemu-kvm-rhev PATCH v2 5/7] pci: Add INTERFACE_CONVENTIONAL_PCI_DEVICE to Conventional PCI devices

Bugzilla: 1390348

RH-Acked-by: Marcel Apfelbaum <marcel@redhat.com>

RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

Add INTERFACE_CONVENTIONAL_PCI_DEVICE to all direct subtypes of

TYPE_PCI_DEVICE, except:

1) The ones that already have INTERFACE_PCIE_DEVICE set:

* base-xhci

* e1000e

* nvme

* pvscsi

* vfio-pci

* virtio-pci

* vmxnet3

2) base-pci-bridge

Not all PCI bridges are Conventional PCI devices, so

INTERFACE_CONVENTIONAL_PCI_DEVICE is added only to the subtypes

that are actually Conventional PCI:

* dec-21154-p2p-bridge

* i82801b11-bridge

* pbm-bridge

* pci-bridge

The direct subtypes of base-pci-bridge not touched by this patch

are:

* xilinx-pcie-root: Already marked as PCIe-only.

* pcie-pci-bridge: Already marked as PCIe-only.

* pcie-port: all non-abstract subtypes of pcie-port are already

  marked as PCIe-only devices.

3) megasas-base

Not all megasas devices are Conventional PCI devices, so the

interface names are added to the subclasses registered by

megasas_register_types(), according to information in the

megasas_devices[] array.

"megasas-gen2" already implements INTERFACE_PCIE_DEVICE, so add

INTERFACE_CONVENTIONAL_PCI_DEVICE only to "megasas".

Backport notes:

* Trivial conflicts:

  * hw/net/sungem.c

  * hw/net/sunhme.c

  * hw/pci-host/apb.c

Acked-by: Alberto Garcia <berto@igalia.com>

Acked-by: John Snow <jsnow@redhat.com>

Acked-by: Anthony PERARD <anthony.perard@citrix.com>

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

Acked-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>

(cherry picked from commit fd3b02c8896d597dd8b9e053dec579cf0386aee1)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

---

Changes v1 -> v2:

* Removed hw/net/sungem.c and hw/net/sunhme.c

  (Mistake spotted by David Gibson)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/acpi/piix4.c                     |  1 +

 hw/audio/ac97.c                     |  4 ++++

 hw/audio/es1370.c                   |  4 ++++

 hw/audio/intel-hda.c                |  4 ++++

 hw/char/serial-pci.c                | 12 ++++++++++++

 hw/display/cirrus_vga.c             |  4 ++++

 hw/display/qxl.c                    |  4 ++++

 hw/display/sm501.c                  |  4 ++++

 hw/display/vga-pci.c                |  4 ++++

 hw/display/vmware_vga.c             |  4 ++++

 hw/i2c/smbus_ich9.c                 |  4 ++++

 hw/i386/amd_iommu.c                 |  4 ++++

 hw/i386/kvm/pci-assign.c            |  4 ++++

 hw/i386/pc_piix.c                   |  4 ++++

 hw/i386/xen/xen_platform.c          |  4 ++++

 hw/i386/xen/xen_pvdevice.c          |  4 ++++

 hw/ide/ich.c                        |  4 ++++

 hw/ide/pci.c                        |  4 ++++

 hw/ipack/tpci200.c                  |  4 ++++

 hw/isa/i82378.c                     |  4 ++++

 hw/isa/lpc_ich9.c                   |  1 +

 hw/isa/piix4.c                      |  4 ++++

 hw/isa/vt82c686.c                   | 16 ++++++++++++++++

 hw/mips/gt64xxx_pci.c               |  4 ++++

 hw/misc/edu.c                       |  5 +++++

 hw/misc/ivshmem.c                   |  4 ++++

 hw/misc/macio/macio.c               |  4 ++++

 hw/misc/pci-testdev.c               |  4 ++++

 hw/net/e1000.c                      |  4 ++++

 hw/net/eepro100.c                   |  4 ++++

 hw/net/ne2000.c                     |  4 ++++

 hw/net/pcnet-pci.c                  |  4 ++++

 hw/net/rocker/rocker.c              |  4 ++++

 hw/net/rtl8139.c                    |  4 ++++

 hw/pci-bridge/dec.c                 |  8 ++++++++

 hw/pci-bridge/i82801b11.c           |  4 ++++

 hw/pci-bridge/pci_bridge_dev.c      |  1 +

 hw/pci-bridge/pci_expander_bridge.c |  8 ++++++++

 hw/pci-host/apb.c                   |  8 ++++++++

 hw/pci-host/bonito.c                |  4 ++++

 hw/pci-host/gpex.c                  |  4 ++++

 hw/pci-host/grackle.c               |  4 ++++

 hw/pci-host/piix.c                  |  8 ++++++++

 hw/pci-host/ppce500.c               |  4 ++++

 hw/pci-host/prep.c                  |  4 ++++

 hw/pci-host/q35.c                   |  4 ++++

 hw/pci-host/uninorth.c              | 16 ++++++++++++++++

 hw/pci-host/versatile.c             |  4 ++++

 hw/ppc/ppc4xx_pci.c                 |  4 ++++

 hw/scsi/esp-pci.c                   |  4 ++++

 hw/scsi/lsi53c895a.c                |  4 ++++

 hw/scsi/megasas.c                   |  4 ++++

 hw/scsi/mptsas.c                    |  4 ++++

 hw/sd/sdhci.c                       |  4 ++++

 hw/sh4/sh_pci.c                     |  4 ++++

 hw/sparc64/sun4u.c                  |  4 ++++

 hw/usb/hcd-ehci-pci.c               |  4 ++++

 hw/usb/hcd-ohci.c                   |  4 ++++

 hw/usb/hcd-uhci.c                   |  4 ++++

 hw/vfio/pci-quirks.c                |  4 ++++

 hw/watchdog/wdt_i6300esb.c          |  4 ++++

 hw/xen/xen_pt.c                     |  4 ++++

 62 files changed, 288 insertions(+)

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c

index efd80d1..34c6e22 100644

--- a/hw/acpi/piix4.c

+++ b/hw/acpi/piix4.c

@@ -723,6 +723,7 @@ static const TypeInfo piix4_pm_info = {

     .interfaces = (InterfaceInfo[]) {

         { TYPE_HOTPLUG_HANDLER },

         { TYPE_ACPI_DEVICE_IF },

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

         { }

     }

 };

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c

index 959c786..337402e 100644

--- a/hw/audio/ac97.c

+++ b/hw/audio/ac97.c

@@ -1431,6 +1431,10 @@ static const TypeInfo ac97_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof (AC97LinkState),

     .class_init    = ac97_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void ac97_register_types (void)

diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c

index dd7c23d..59cf252 100644

--- a/hw/audio/es1370.c

+++ b/hw/audio/es1370.c

@@ -1082,6 +1082,10 @@ static const TypeInfo es1370_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof (ES1370State),

     .class_init    = es1370_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void es1370_register_types (void)

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c

index 06acc98..b786491 100644

--- a/hw/audio/intel-hda.c

+++ b/hw/audio/intel-hda.c

@@ -1299,6 +1299,10 @@ static const TypeInfo intel_hda_info = {

     .instance_size = sizeof(IntelHDAState),

     .class_init    = intel_hda_class_init,

     .abstract      = true,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static const TypeInfo intel_hda_info_ich6 = {

diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c

index 24ce17b..d426982 100644

--- a/hw/char/serial-pci.c

+++ b/hw/char/serial-pci.c

@@ -254,6 +254,10 @@ static const TypeInfo serial_pci_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(PCISerialState),

     .class_init    = serial_pci_class_initfn,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static const TypeInfo multi_2x_serial_pci_info = {

@@ -261,6 +265,10 @@ static const TypeInfo multi_2x_serial_pci_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(PCIMultiSerialState),

     .class_init    = multi_2x_serial_pci_class_initfn,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static const TypeInfo multi_4x_serial_pci_info = {

@@ -268,6 +276,10 @@ static const TypeInfo multi_4x_serial_pci_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(PCIMultiSerialState),

     .class_init    = multi_4x_serial_pci_class_initfn,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void serial_pci_register_types(void)

diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c

index e53c6f2..633d555 100644

--- a/hw/display/cirrus_vga.c

+++ b/hw/display/cirrus_vga.c

@@ -3162,6 +3162,10 @@ static const TypeInfo cirrus_vga_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(PCICirrusVGAState),

     .class_init    = cirrus_vga_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void cirrus_vga_register_types(void)

diff --git a/hw/display/qxl.c b/hw/display/qxl.c

index ae3677f..b20e259 100644

--- a/hw/display/qxl.c

+++ b/hw/display/qxl.c

@@ -2430,6 +2430,10 @@ static const TypeInfo qxl_pci_type_info = {

     .instance_size = sizeof(PCIQXLDevice),

     .abstract = true,

     .class_init = qxl_pci_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void qxl_primary_class_init(ObjectClass *klass, void *data)

diff --git a/hw/display/sm501.c b/hw/display/sm501.c

index 6f3dfe0..7f18224 100644

--- a/hw/display/sm501.c

+++ b/hw/display/sm501.c

@@ -1843,6 +1843,10 @@ static const TypeInfo sm501_pci_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(SM501PCIState),

     .class_init    = sm501_pci_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void sm501_register_types(void)

diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c

index ac9a764..7adb89f 100644

--- a/hw/display/vga-pci.c

+++ b/hw/display/vga-pci.c

@@ -338,6 +338,10 @@ static const TypeInfo vga_pci_type_info = {

     .instance_size = sizeof(PCIVGAState),

     .abstract = true,

     .class_init = vga_pci_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void vga_class_init(ObjectClass *klass, void *data)

diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c

index 4a64b41..cdc3fed 100644

--- a/hw/display/vmware_vga.c

+++ b/hw/display/vmware_vga.c

@@ -1350,6 +1350,10 @@ static const TypeInfo vmsvga_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(struct pci_vmsvga_state_s),

     .class_init    = vmsvga_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void vmsvga_register_types(void)

diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c

index ea51e09..e47556c 100644

--- a/hw/i2c/smbus_ich9.c

+++ b/hw/i2c/smbus_ich9.c

@@ -119,6 +119,10 @@ static const TypeInfo ich9_smb_info = {

     .parent = TYPE_PCI_DEVICE,

     .instance_size = sizeof(ICH9SMBState),

     .class_init = ich9_smb_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void ich9_smb_register(void)

diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c

index 334938a..ad8155c 100644

--- a/hw/i386/amd_iommu.c

+++ b/hw/i386/amd_iommu.c

@@ -1227,6 +1227,10 @@ static const TypeInfo amdviPCI = {

     .name = "AMDVI-PCI",

     .parent = TYPE_PCI_DEVICE,

     .instance_size = sizeof(AMDVIPCIState),

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void amdvi_iommu_memory_region_class_init(ObjectClass *klass, void *data)

diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c

index 33e20cb..d8559d8 100644

--- a/hw/i386/kvm/pci-assign.c

+++ b/hw/i386/kvm/pci-assign.c

@@ -1864,6 +1864,10 @@ static const TypeInfo assign_info = {

     .instance_size      = sizeof(AssignedDevice),

     .class_init         = assign_class_init,

     .instance_init      = assigned_dev_instance_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void assign_register_types(void)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c

index 09bfc5a..c10e462 100644

--- a/hw/i386/pc_piix.c

+++ b/hw/i386/pc_piix.c

@@ -1051,6 +1051,10 @@ static TypeInfo isa_bridge_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(PCIDevice),

     .class_init = isa_bridge_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void pt_graphics_register_types(void)

diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c

index 9ba7474..056b87d 100644

--- a/hw/i386/xen/xen_platform.c

+++ b/hw/i386/xen/xen_platform.c

@@ -517,6 +517,10 @@ static const TypeInfo xen_platform_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(PCIXenPlatformState),

     .class_init    = xen_platform_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void xen_platform_register_types(void)

diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c

index c093b34..f748823 100644

--- a/hw/i386/xen/xen_pvdevice.c

+++ b/hw/i386/xen/xen_pvdevice.c

@@ -127,6 +127,10 @@ static const TypeInfo xen_pv_type_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(XenPVDevice),

     .class_init    = xen_pv_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void xen_pv_register_types(void)

diff --git a/hw/ide/ich.c b/hw/ide/ich.c

index 9472a60..8dd0ced 100644

--- a/hw/ide/ich.c

+++ b/hw/ide/ich.c

@@ -184,6 +184,10 @@ static const TypeInfo ich_ahci_info = {

     .instance_size = sizeof(AHCIPCIState),

     .instance_init = pci_ich9_ahci_init,

     .class_init    = ich_ahci_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void ich_ahci_register_types(void)

diff --git a/hw/ide/pci.c b/hw/ide/pci.c

index 3cfb510..428980b 100644

--- a/hw/ide/pci.c

+++ b/hw/ide/pci.c

@@ -458,6 +458,10 @@ static const TypeInfo pci_ide_type_info = {

     .parent = TYPE_PCI_DEVICE,

     .instance_size = sizeof(PCIIDEState),

     .abstract = true,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void pci_ide_register_types(void)

diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c

index 4dfa6b3..da05c85 100644

--- a/hw/ipack/tpci200.c

+++ b/hw/ipack/tpci200.c

@@ -646,6 +646,10 @@ static const TypeInfo tpci200_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(TPCI200State),

     .class_init    = tpci200_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void tpci200_register_types(void)

diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c

index 4d29a99..d20ea4c 100644

--- a/hw/isa/i82378.c

+++ b/hw/isa/i82378.c

@@ -138,6 +138,10 @@ static const TypeInfo i82378_type_info = {

     .instance_size = sizeof(I82378State),

     .instance_init = i82378_init,

     .class_init = i82378_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void i82378_register_types(void)

diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c

index ac8416d..39f56ba 100644

--- a/hw/isa/lpc_ich9.c

+++ b/hw/isa/lpc_ich9.c

@@ -823,6 +823,7 @@ static const TypeInfo ich9_lpc_info = {

     .interfaces = (InterfaceInfo[]) {

         { TYPE_HOTPLUG_HANDLER },

         { TYPE_ACPI_DEVICE_IF },

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

         { }

     }

 };

diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c

index f811eba..6b8bc3f 100644

--- a/hw/isa/piix4.c

+++ b/hw/isa/piix4.c

@@ -132,6 +132,10 @@ static const TypeInfo piix4_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(PIIX4State),

     .class_init    = piix4_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void piix4_register_types(void)

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c

index 50dc83d..c129985 100644

--- a/hw/isa/vt82c686.c

+++ b/hw/isa/vt82c686.c

@@ -301,6 +301,10 @@ static const TypeInfo via_ac97_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(VT686AC97State),

     .class_init    = via_ac97_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void vt82c686b_mc97_realize(PCIDevice *dev, Error **errp)

@@ -341,6 +345,10 @@ static const TypeInfo via_mc97_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(VT686MC97State),

     .class_init    = via_mc97_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 /* vt82c686 pm init */

@@ -419,6 +427,10 @@ static const TypeInfo via_pm_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(VT686PMState),

     .class_init    = via_pm_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static const VMStateDescription vmstate_via = {

@@ -502,6 +514,10 @@ static const TypeInfo via_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(VT82C686BState),

     .class_init    = via_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void vt82c686b_register_types(void)

diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c

index e8b2eef..5a9dad9 100644

--- a/hw/mips/gt64xxx_pci.c

+++ b/hw/mips/gt64xxx_pci.c

@@ -1232,6 +1232,10 @@ static const TypeInfo gt64120_pci_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(PCIDevice),

     .class_init    = gt64120_pci_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void gt64120_class_init(ObjectClass *klass, void *data)

diff --git a/hw/misc/edu.c b/hw/misc/edu.c

index 01acacf..34eb05d 100644

--- a/hw/misc/edu.c

+++ b/hw/misc/edu.c

@@ -408,12 +408,17 @@ static void edu_class_init(ObjectClass *class, void *data)

 static void pci_edu_register_types(void)

 {

+    static InterfaceInfo interfaces[] = {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    };

     static const TypeInfo edu_info = {

         .name          = "edu",

         .parent        = TYPE_PCI_DEVICE,

         .instance_size = sizeof(EduState),

         .instance_init = edu_instance_init,

         .class_init    = edu_class_init,

+        .interfaces = interfaces,

     };

     type_register_static(&edu_info);

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c

index 33ef10b..a0a1480 100644

--- a/hw/misc/ivshmem.c

+++ b/hw/misc/ivshmem.c

@@ -1017,6 +1017,10 @@ static const TypeInfo ivshmem_common_info = {

     .instance_size = sizeof(IVShmemState),

     .abstract      = true,

     .class_init    = ivshmem_common_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static const VMStateDescription ivshmem_plain_vmsd = {

diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c

index 5d57f45..298e650 100644

--- a/hw/misc/macio/macio.c

+++ b/hw/misc/macio/macio.c

@@ -415,6 +415,10 @@ static const TypeInfo macio_type_info = {

     .instance_init = macio_instance_init,

     .abstract      = true,

     .class_init    = macio_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void macio_register_types(void)

diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c

index 7d59902..32041f5 100644

--- a/hw/misc/pci-testdev.c

+++ b/hw/misc/pci-testdev.c

@@ -326,6 +326,10 @@ static const TypeInfo pci_testdev_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(PCITestDevState),

     .class_init    = pci_testdev_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void pci_testdev_register_types(void)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c

index d29e9ee..793d54a 100644

--- a/hw/net/e1000.c

+++ b/hw/net/e1000.c

@@ -1695,6 +1695,10 @@ static const TypeInfo e1000_base_info = {

     .instance_init = e1000_instance_init,

     .class_size    = sizeof(E1000BaseClass),

     .abstract      = true,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static const E1000Info e1000_devices[] = {

diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c

index 5a4774a..522deb7 100644

--- a/hw/net/eepro100.c

+++ b/hw/net/eepro100.c

@@ -2117,6 +2117,10 @@ static void eepro100_register_types(void)

         type_info.class_init = eepro100_class_init;

         type_info.instance_size = sizeof(EEPRO100State);

         type_info.instance_init = eepro100_instance_init;

+        type_info.interfaces = (InterfaceInfo[]) {

+            { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+            { },

+        };

         type_register(&type_info);

     }

diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c

index 8660955..2284308 100644

--- a/hw/net/ne2000.c

+++ b/hw/net/ne2000.c

@@ -786,6 +786,10 @@ static const TypeInfo ne2000_info = {

     .instance_size = sizeof(PCINE2000State),

     .class_init    = ne2000_class_init,

     .instance_init = ne2000_instance_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void ne2000_register_types(void)

diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c

index eeab4ca..0e4d4f7 100644

--- a/hw/net/pcnet-pci.c

+++ b/hw/net/pcnet-pci.c

@@ -365,6 +365,10 @@ static const TypeInfo pcnet_info = {

     .instance_size = sizeof(PCIPCNetState),

     .class_init    = pcnet_class_init,

     .instance_init = pcnet_instance_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void pci_pcnet_register_types(void)

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c

index 4f0f6d7..26d78eb 100644

--- a/hw/net/rocker/rocker.c

+++ b/hw/net/rocker/rocker.c

@@ -1573,6 +1573,10 @@ static const TypeInfo rocker_info = {

     .parent        = TYPE_PCI_DEVICE,

     .instance_size = sizeof(Rocker),

     .class_init    = rocker_class_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void rocker_register_types(void)

diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c

index 80c62dc..52eafc3 100644

--- a/hw/net/rtl8139.c

+++ b/hw/net/rtl8139.c

@@ -3491,6 +3491,10 @@ static const TypeInfo rtl8139_info = {

     .instance_size = sizeof(RTL8139State),

     .class_init    = rtl8139_class_init,

     .instance_init = rtl8139_instance_init,

+    .interfaces = (InterfaceInfo[]) {

+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

+        { },

+    },

 };

 static void rtl8139_register_types(void)

diff --git a/hw/pci-bridge/dec.c b/hw/pci-bridge/dec.c

index eb275e1..84492d5 100644

--- a/hw/pci-bridge/dec.c

+++ b/hw/pci-bridge/dec.c

@@ -79,6 +79,10 @@ static const TypeInfo dec_21154_pci_bridge_info = {

     .parent        = TYPE_PCI_BRIDGE,

     .instance_size = sizeof(PCIBridge),

     .class_init    = dec_21154_pci_bridge_class_init,

+    .interfaces = (InterfaceInfo[]) {