Commit d61a363d authored by Yoni Bettan's avatar Yoni Bettan Committed by Michael S. Tsirkin
Browse files

pci: removed the is_express field since a uniform interface was inserted 



according to Eduardo Habkost's commit fd3b02c8 all PCIEs now implement
INTERFACE_PCIE_DEVICE so we don't need is_express field anymore.

Devices that implements only INTERFACE_PCIE_DEVICE (is_express == 1)
or
devices that implements only INTERFACE_CONVENTIONAL_PCI_DEVICE (is_express == 0)
where not affected by the change.

The only devices that were affected are those that are hybrid and also
had (is_express == 1) - therefor only:
  - hw/vfio/pci.c
  - hw/usb/hcd-xhci.c
  - hw/xen/xen_pt.c

For those 3 I made sure that QEMU_PCI_CAP_EXPRESS is on in instance_init()

Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarYoni Bettan <ybettan@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 0ebf9a74

docs/pcie_pci_bridge.txt

+1 −1
Original line number Diff line number Diff line
@@ -110,5 +110,5 @@ To enable device hot-plug into the bridge on Linux there're 3 ways: 
Implementation

==============

The PCIE-PCI bridge is based on PCI-PCI bridge, but also accumulates PCI Express

features as a PCI Express device (is_express=1).

features as a PCI Express device.

hw/block/nvme.c

+0 −1
Original line number Diff line number Diff line
@@ -1360,7 +1360,6 @@ static void nvme_class_init(ObjectClass *oc, void *data) 
    pc->vendor_id = PCI_VENDOR_ID_INTEL;

    pc->device_id = 0x5845;

    pc->revision = 2;

    pc->is_express = 1;



    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

    dc->desc = "Non-Volatile Memory Express";

hw/net/e1000e.c

+0 −1
Original line number Diff line number Diff line
@@ -675,7 +675,6 @@ static void e1000e_class_init(ObjectClass *class, void *data) 
    c->revision = 0;

    c->romfile = "efi-e1000e.rom";

    c->class_id = PCI_CLASS_NETWORK_ETHERNET;

    c->is_express = 1;



    dc->desc = "Intel 82574L GbE Controller";

    dc->reset = e1000e_qdev_reset;

hw/pci-bridge/pcie_pci_bridge.c

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ static void pcie_pci_bridge_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);



    k->is_express = 1;

    k->is_bridge = 1;

    k->vendor_id = PCI_VENDOR_ID_REDHAT;

    k->device_id = PCI_DEVICE_ID_REDHAT_PCIE_BRIDGE;

hw/pci-bridge/pcie_root_port.c

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ static void rp_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->is_express = 1;

    k->is_bridge = 1;

    k->config_write = rp_write_config;

    k->realize = rp_realize;