From: Yi Min Zhao <[email protected]> When deconfiguring a s390 pci device, we should deconfigure the corresponding IOMMU memory region and the IRQs for the device.
Signed-off-by: Yi Min Zhao <[email protected]> Reviewed-by: Pierre Morel <[email protected]> Signed-off-by: Cornelia Huck <[email protected]> --- hw/s390x/s390-pci-bus.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 5d54c73..b2cd31c 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -15,6 +15,7 @@ #include "qemu-common.h" #include "cpu.h" #include "s390-pci-bus.h" +#include "s390-pci-inst.h" #include <hw/pci/pci_bus.h> #include <hw/pci/msi.h> #include <qemu/error-report.h> @@ -137,6 +138,12 @@ void s390_pci_sclp_deconfigure(SCCB *sccb) if (!pbdev->configured) { rc = SCLP_RC_NO_ACTION_REQUIRED; } else { + if (pbdev->summary_ind) { + pci_dereg_irqs(pbdev); + } + if (pbdev->iommu_enabled) { + pci_dereg_ioat(pbdev); + } pbdev->configured = false; rc = SCLP_RC_NORMAL_COMPLETION; } -- 2.8.2
