[Qemu-commits] [qemu/qemu] 0446f8: vfio/pci: Don't remove irqchip notifier if not reg...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0446f8121723b134ca1d1ed0b73e96d4a0a8689d
      
https://github.com/qemu/qemu/commit/0446f8121723b134ca1d1ed0b73e96d4a0a8689d
  Author: Peter Xu <address@hidden>
  Date:   2020-01-06 (Mon, 06 Jan 2020)

  Changed paths:
    M hw/vfio/pci.c

  Log Message:
  -----------
  vfio/pci: Don't remove irqchip notifier if not registered

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 <address@hidden>
CC: David Gibson <address@hidden>
CC: Alex Williamson <address@hidden>
Cc: address@hidden # v4.2
Reported-by: address@hidden
Debugged-by: Eduardo Habkost <address@hidden>
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 <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Greg Kurz <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: a8f2c60cef0ab7548e8160437546f24c2ce5cf9e
      
https://github.com/qemu/qemu/commit/a8f2c60cef0ab7548e8160437546f24c2ce5cf9e
  Author: Peter Maydell <address@hidden>
  Date:   2020-01-07 (Tue, 07 Jan 2020)

  Changed paths:
    M hw/vfio/pci.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20200106.0' 
into staging

VFIO fixes 2020-01-06

 - Fix irqchip notifier de-registration if not registered (Peter Xu)

# gpg: Signature made Mon 06 Jan 2020 21:58:17 GMT
# gpg:                using RSA key 239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <address@hidden>" [full]
# gpg:                 aka "Alex Williamson <address@hidden>" [full]
# gpg:                 aka "Alex Williamson <address@hidden>" [full]
# gpg:                 aka "Alex Williamson <address@hidden>" [full]
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B  8A90 239B 9B6E 3BB0 8B22

* remotes/awilliam/tags/vfio-fixes-20200106.0:
  vfio/pci: Don't remove irqchip notifier if not registered

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/cdbc5c51c875...a8f2c60cef0a