Commit 57da367b authored by Yi Min Zhao's avatar Yi Min Zhao Committed by Christian Borntraeger
Browse files

s390x/pci: forbid multifunction pci device 



Currently we don't support pci multifunction. If a pci with
multifucntion is plugged, the guest will spin forever. This patch fixes
this.

Signed-off-by: default avatarYi Min Zhao <zyimin@linux.vnet.ibm.com>
Reviewed-by: default avatarPierre Morel <pmorel@linux.vnet.ibm.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent d522e0bd

hw/s390x/s390-pci-bus.c

+10 −0
Original line number Diff line number Diff line
@@ -816,6 +816,11 @@ static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev, 
        PCIBridge *pb = PCI_BRIDGE(dev);

        PCIDevice *pdev = PCI_DEVICE(dev);



        if (pdev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) {

            error_setg(errp, "multifunction not supported in s390");

            return;

        }



        pci_bridge_map_irq(pb, dev->id, s390_pci_map_irq);

        pci_setup_iommu(&pb->sec_bus, s390_pci_dma_iommu, s);
@@ -835,6 +840,11 @@ static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev, 
    } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {

        pdev = PCI_DEVICE(dev);



        if (pdev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) {

            error_setg(errp, "multifunction not supported in s390");

            return;

        }



        if (!dev->id) {

            /* In the case the PCI device does not define an id */

            /* we generate one based on the PCI address         */