From 57da367b9ec4da86ac944b8b54093056d8bcf76d Mon Sep 17 00:00:00 2001 From: Yi Min Zhao Date: Tue, 13 Mar 2018 16:09:49 +0800 Subject: [PATCH 1/2] 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: Yi Min Zhao Reviewed-by: Pierre Morel Reviewed-by: Thomas Huth Signed-off-by: Christian Borntraeger --- 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 */ From 06a97edac172f52971d7bdca6bb56a1edcb1b8f6 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Tue, 20 Mar 2018 13:03:00 +0000 Subject: [PATCH 2/2] s390x/cpumodel: fix feature groups and breakage of MSA8 Since commit 46a99c9f73c7 ("s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility") -cpu help no longer shows the MSA8 feature group. Turns out that we forgot to add the new MEPOCH_PTFF group enum. Fixes: 46a99c9f73c7 ("s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility") Reviewed-by: David Hildenbrand Signed-off-by: Christian Borntraeger --- target/s390x/cpu_features.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h index e306aa7ab2..968b12fdfe 100644 --- a/target/s390x/cpu_features.h +++ b/target/s390x/cpu_features.h @@ -78,6 +78,7 @@ typedef enum { S390_FEAT_GROUP_MSA_EXT_6, S390_FEAT_GROUP_MSA_EXT_7, S390_FEAT_GROUP_MSA_EXT_8, + S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF, S390_FEAT_GROUP_MAX, } S390FeatGroup;