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

pci: Add INTERFACE_CONVENTIONAL_PCI_DEVICE to Conventional PCI devices 



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".

Acked-by: default avatarAlberto Garcia <berto@igalia.com>
Acked-by: default avatarJohn Snow <jsnow@redhat.com>
Acked-by: default avatarAnthony PERARD <anthony.perard@citrix.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Acked-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 71d78767

hw/acpi/piix4.c

+1 −0
Original line number Diff line number Diff line
@@ -718,6 +718,7 @@ static const TypeInfo piix4_pm_info = { 
    .interfaces = (InterfaceInfo[]) {

        { TYPE_HOTPLUG_HANDLER },

        { TYPE_ACPI_DEVICE_IF },

        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

        { }

    }

};

hw/audio/ac97.c

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

hw/audio/es1370.c

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

hw/audio/intel-hda.c

+4 −0
Original line number Diff line number Diff line
@@ -1263,6 +1263,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 = {

hw/char/serial-pci.c

+12 −0
Original line number Diff line number Diff line
@@ -250,6 +250,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 = {
@@ -257,6 +261,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 = {
@@ -264,6 +272,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)