openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

VFIO fixes 2017-04-06 

- Extra test for NVIDIA BAR5 quirk to avoid segfault (Alex Williamson)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJY5rvBAAoJECObm247sIsivd0QAIRWkXuoZ6B8E7+H03JpdKDD
 iDW6Jkolg+Dd497d2rSuvW2lGGOIlkjBVaLPiQnRkHVhjizUeFJvQUg+f6+gShLP
 UKrsHb0zm2v57XqBazj96892IX0VxGVm5a4H01lkYnjfnX2NYBSm8r92+cv5ilVC
 35p5x5i3aRkNhdNDLhMgLG8DIrFYtKcjILS0ngoiLn1hSJHjIcdSfgZy2w68HkE+
 SZdX3XUu9/Uh/d1xUsujKS9BIWQJIoSX1tGHatBaPjBuK3yJ2U+oCS4CNXUTx2fN
 49T60EBIKvOEhPWh6zIuYV4I8icH3SXe3KueaiaUAtRrDk+IGraf/uKT/QDqs1wy
 SDO76OVwPl6QGjvUYgIrsW4BLvvECrQb9prHj6uufVrpFZ6iXo3QnvOKy6wZEuiY
 ViH7IMnE6gmL6J7KkMN+9GOFrbl10wm+2isl6VgEKjSYWGPBLMAs/U65Vih2lDlh
 QKJ1sGZy/EmWwS8o+EijMiSG7fDAMzsCFCi2SEQt61W88EF6ngJli84OObNOYstE
 6wNVK4Adx08Prj5WVDv5Znm5lvXCnv68g6h9pUY7O6tRKHSy6RmKGcBfMCD5+aFA
 zLEKR8LpxhjRV5l2RXTW5D65qZYDz0+gQvJiPPHS5GmFHaVr3i6t5WdLRZZHYs1K
 kzHYJB5CcOhc08IDH/cq
 =g/cY
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20170406.0' into staging

VFIO fixes 2017-04-06

 - Extra test for NVIDIA BAR5 quirk to avoid segfault (Alex Williamson)

# gpg: Signature made Thu 06 Apr 2017 23:05:53 BST
# gpg:                using RSA key 0x239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg:                 aka "Alex Williamson <alex@shazbot.org>"
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>"
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>"
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B  8A90 239B 9B6E 3BB0 8B22

* remotes/awilliam/tags/vfio-updates-20170406.0:
  vfio/pci-quirks: Exclude non-ioport BAR from NVIDIA quirk

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-04-07 10:29:56 +01:00
parent 54d689988c 8f419c5b43
commit 5fe2339e6b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/vfio/pci-quirks.c
View File

@ -660,7 +660,7 @@ static void vfio_probe_nvidia_bar5_quirk(VFIOPCIDevice *vdev, int nr)
VFIOConfigWindowQuirk *window;
if (!vfio_pci_is(vdev, PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID) ||
!vdev->vga || nr != 5) {
!vdev->vga || nr != 5 || !vdev->bars[5].ioport) {
return;
}