diff options
| author | Peter Maydell | 2017-04-07 11:29:56 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-04-07 11:29:56 +0200 |
| commit | 5fe2339e6b09da7d6f48b9bef0f1a7360392b489 (patch) | |
| tree | 012ea99abecf32424341c39e7553274c5ddb8835 | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | vfio/pci-quirks: Exclude non-ioport BAR from NVIDIA quirk (diff) | |
| download | qemu-5fe2339e6b09da7d6f48b9bef0f1a7360392b489.tar.gz qemu-5fe2339e6b09da7d6f48b9bef0f1a7360392b489.tar.xz qemu-5fe2339e6b09da7d6f48b9bef0f1a7360392b489.zip | |
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>
| -rw-r--r-- | hw/vfio/pci-quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index e9b493b939..349085ea12 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -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; } |