diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-23 10:20:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-23 10:20:54 +0000 |
| commit | 4c2c1015905fa1d616750dfe024b4c0b35875950 (patch) | |
| tree | deac0c236e295564b2dbf5b45346ecf0b06fb4ac | |
| parent | d522e0bd18364f6d784d43edab35b0563d21f6f3 (diff) | |
| parent | 06a97edac172f52971d7bdca6bb56a1edcb1b8f6 (diff) | |
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20180323' into staging
s390x: Fixes for 2.12
- Fix for the s390 cpumodel
- Forbid multifunction PCI devices
# gpg: Signature made Fri 23 Mar 2018 09:06:31 GMT
# gpg: using RSA key 117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB FBCA 117B BC80 B5A6 1C7C
* remotes/borntraeger/tags/s390x-20180323:
s390x/cpumodel: fix feature groups and breakage of MSA8
s390x/pci: forbid multifunction pci device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/s390x/s390-pci-bus.c | 10 | ||||
| -rw-r--r-- | target/s390x/cpu_features.h | 1 |
2 files changed, 11 insertions, 0 deletions
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 */ 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; |