applied to my s390-next branch.
On 03/14/2018 06:14 AM, Yi Min Zhao wrote: > 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: Yi Min Zhao <zyi...@linux.vnet.ibm.com> > Reviewed-by: Pierre Morel <pmo...@linux.vnet.ibm.com> > --- > hw/s390x/s390-pci-bus.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 77a50cab36..10da87458e 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -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 */ >