haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

VFIO fixes 2020-01-06

Browse source 
- Fix irqchip notifier de-registration if not registered (Peter Xu)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJeE615AAoJECObm247sIsi+IgQALBY5KS4d9tSlMjpR8WgGXTW
 wWLkOhuPdb4l+DIKivmYBO5XtXjsKTE6YMIsTkeOPZWVP/daEQvm8pxHFcxh5jXl
 riRLt1OWPP/MJ0umLmuNleKCfSkTyyAW9IDz72Pwink/Uebuy4IYAv8vWWtlPEUl
 72Pt4H3WfW/MYBOc01DrTOz9V10RS+e+tf+HtnEWmGXf6tWEj+8qx7dZh6+O8F+n
 skGbHFDReL4jumeNynYNVcaMuMVXwrZ0OHi1I1Tebe3XBLn/3cQq/lepKaTrKjVh
 UdYqp6XY9gcOKl7+xUxf7Ov1++LLbKfrxXViH1PHbs8e1QgpRdEe8cSDJK3eTgrg
 H7tCF6IJ5pzcU+lGjAsVmHJxL6GXZtHqHxzxx1mKC5mNBcqjUbVCyX1Wak4XqUQd
 0ccaSIt/msPcIlvq/YWaHaEp7YBFnSntVBLqjCuWKc+8QEVUhUJYI2XNViNt86Xz
 9T2b3c6234tWVXGIYAt5YSj0MCokPBi2aT82P3b6AS02pS3riu63JkiwtckJhGOQ
 5ASIF8RuPg9TsVIb8gPEl2xyiEZ6LFF4WtVQIbzih3zSllTO9i1pVKvjZ0HGaHF/
 angF/oyYYPk+xLMdx5kgUccR8hMOj2wcfrySwL72SCOI4eFSuRY7X7Ctio947pXE
 BI7YlltIuccOkJe4kmUl
 =Uxch
 -----END PGP SIGNATURE-----

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 <alex.williamson@redhat.com>" [full]
# gpg:                 aka "Alex Williamson <alex@shazbot.org>" [full]
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>" [full]
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>" [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 <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-01-07 11:09:54 +00:00
parent cdbc5c51c8 0446f81217
commit a8f2c60cef
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/vfio/pci.c
View file

@ -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);