[PULL,1/1] vfio/pci: Don't remove irqchip notifier if not registered

Commit Message

Alex Williamson Jan. 6, 2020, 10:09 p.m. UTC

From: Peter Xu <[e-mail]>

The kvm irqchip notifier is only registered if the device supports
INTx, however it's unconditionally removed.  If the assigned device
does not support INTx, this will cause QEMU to crash when unplugging
the device from the system.  Change it to conditionally remove the
notifier only if the notify hook is setup.

CC: Eduardo Habkost <[e-mail]>
CC: David Gibson <[e-mail]>
CC: Alex Williamson <[e-mail]>
Cc: [e-mail] # v4.2
Reported-by: [e-mail]
Debugged-by: Eduardo Habkost <[e-mail]>
Fixes: c5478fea27ac ("vfio/pci: Respond to KVM irqchip change notifier")
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1782678
Signed-off-by: Peter Xu <[e-mail]>
Reviewed-by: David Gibson <[e-mail]>
Reviewed-by: Greg Kurz <[e-mail]>
Signed-off-by: Alex Williamson <[e-mail]>
---
 hw/vfio/pci.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 2d40b396f24c..337a173ce7c6 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3076,7 +3076,9 @@  static void vfio_exitfn(PCIDevice *pdev)
     vfio_unregister_req_notifier(vdev);
     vfio_unregister_err_notifier(vdev);
     pci_device_set_intx_routing_notifier(&vdev->pdev, NULL);
-    kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier);
+    if (vdev->irqchip_change_notifier.notify) {
+        kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier);
+    }
     vfio_disable_interrupts(vdev);
     if (vdev->intx.mmap_timer) {
         timer_free(vdev->intx.mmap_timer);