[Qemu-devel] [PULL for-2.9 0/1] VFIO fixes 2017-04-06

[Qemu-devel] [PULL for-2.9 0/1] VFIO fixes 2017-04-06

[Alex Williamson]

The following changes since commit 54d689988c847271d87b3eb113712147129fb811:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into
staging (2017-04-06 09:27:49 +0100)

are available in the git repository at:


  git://github.com/awilliam/qemu-vfio.git tags/vfio-updates-20170406.0

for you to fetch changes up to 8f419c5b43b988df4ef11315aeb8524e50c99687:

  vfio/pci-quirks: Exclude non-ioport BAR from NVIDIA quirk (2017-04-06
16:03:26 -0600)

----------------------------------------------------------------
VFIO fixes 2017-04-06

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

----------------------------------------------------------------
Alex Williamson (1):
      vfio/pci-quirks: Exclude non-ioport BAR from NVIDIA quirk

 hw/vfio/pci-quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PULL for-2.9 1/1] vfio/pci-quirks: Exclude non-ioport BAR from NVIDIA quirk

[Alex Williamson]

The NVIDIA BAR5 quirk is targeting an ioport BAR.  Some older devices
have a BAR5 which is not ioport and can induce a segfault here.  Test
the BAR type to skip these devices.

Link: https://bugs.launchpad.net/qemu/+bug/1678466
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
 hw/vfio/pci-quirks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index e9b493b939db..349085ea12bc 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;
     }
 

Re: [Qemu-devel] [PULL for-2.9 0/1] VFIO fixes 2017-04-06

[Peter Maydell]

On 6 April 2017 at 23:11, Alex Williamson <alex.williamson@redhat.com> wrote:
> The following changes since commit 54d689988c847271d87b3eb113712147129fb811:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into
> staging (2017-04-06 09:27:49 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/awilliam/qemu-vfio.git tags/vfio-updates-20170406.0
>
> for you to fetch changes up to 8f419c5b43b988df4ef11315aeb8524e50c99687:
>
>   vfio/pci-quirks: Exclude non-ioport BAR from NVIDIA quirk (2017-04-06
> 16:03:26 -0600)
>
> ----------------------------------------------------------------
> VFIO fixes 2017-04-06
>
>  - Extra test for NVIDIA BAR5 quirk to avoid segfault (Alex Williamson)
>
> ----------------------------------------------------------------
> Alex Williamson (1):
>       vfio/pci-quirks: Exclude non-ioport BAR from NVIDIA quirk
>
>  hw/vfio/pci-quirks.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

-- PMM