diff options
| author | Matthew Rosato <mjrosato@linux.ibm.com> | 2022-09-02 13:27:33 -0400 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2022-09-26 17:23:47 +0200 |
| commit | 15d0e7942d3b31ff71d8e0e8cec3a8203214f19b (patch) | |
| tree | 9b017362c66240817c327e507b1988e479c9b660 | |
| parent | dd1d5fd9684beeb0c14c39f497ef2aa9ac683aa7 (diff) | |
| download | qemu-15d0e7942d3b31ff71d8e0e8cec3a8203214f19b.zip qemu-15d0e7942d3b31ff71d8e0e8cec3a8203214f19b.tar.gz qemu-15d0e7942d3b31ff71d8e0e8cec3a8203214f19b.tar.bz2 | |
s390x/pci: don't fence interpreted devices without MSI-X
Lack of MSI-X support is not an issue for interpreted passthrough
devices, so let's let these in. This will allow, for example, ISM
devices to be passed through -- but only when interpretation is
available and being used.
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
Message-Id: <20220902172737.170349-5-mjrosato@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | hw/s390x/s390-pci-bus.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 156051e..816d17a 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -881,6 +881,10 @@ static int s390_pci_msix_init(S390PCIBusDevice *pbdev) static void s390_pci_msix_free(S390PCIBusDevice *pbdev) { + if (pbdev->msix.entries == 0) { + return; + } + memory_region_del_subregion(&pbdev->iommu->mr, &pbdev->msix_notify_mr); object_unparent(OBJECT(&pbdev->msix_notify_mr)); } @@ -1093,7 +1097,7 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, pbdev->interp = false; } - if (s390_pci_msix_init(pbdev)) { + if (s390_pci_msix_init(pbdev) && !pbdev->interp) { error_setg(errp, "MSI-X support is mandatory " "in the S390 architecture"); return; |