OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

VFIO fixes 2016-09-15 

Fix a 2.7.0 regression affecting POWER8 systems in relation to EEH,
 possibly extending to subtle changes for other devices and archs.
 (David Gibson)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJX2tr+AAoJECObm247sIsisOQP/i1LH0uRefw2DG1VMUt5U55M
 e+8xP9HB3DHEgLjhPbomwAN8d5sq8FnwdGqoIJbULgh1CLf7SRejKSfHOShlt2N2
 99nJpOPOOdM7v90jiamq9tUPJBKVj38gtc1ijWM77T+yOre2dxefwJAX/hpU1pKx
 x9ck5ovcAnqKeU7lDsgBiv/b0xfPUdoMxF+uDAALeAcYlxGMow3if+yojUqwPhEc
 FQF1j7sVwy3f6r6bzOih8zww8z4gpUU2UT6OFXKN6e1MZfnYNCJXXd4n8JsBhpiZ
 ahoeFpLuhzCHkQUk+y5geoEEKLAPmPCiOOLCxK52W3c+W8by6uc+GV4rJIZPg3mf
 2shfoqKcsG6wGW4uzx8JYWVlUQW9RegLjgMQZIHN1WzxgrzSaoSqBChg6k9GcawY
 mN4NE1dc9x/Cs/Oj4Erq4ZiSdjYFBMPcW1ZAgf6TsuwncpAHJhiJ9N/kuG8CKirw
 f5RktegPMZmCSxnmVHi53hsrinLwifzAmAxAY76vlPul4xu03slBiiPfxZv0YHKX
 ZrMfxD+ahoTFcwfj8ZNgyw2pPlqWrDyVVKlGaXy4qeGbRSgbdiPsoxJErwm5nZ5K
 n6opz1vzSTVcIMkgk8AWvk3KTT5TiybvUl/ZO4GnpB7cbEcQQfZHmjsMDPIxbzqJ
 V0quLhLfKmsn30WGxhiW
 =w730
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20160915.0' into staging

VFIO fixes 2016-09-15

Fix a 2.7.0 regression affecting POWER8 systems in relation to EEH,
possibly extending to subtle changes for other devices and archs.
(David Gibson)

# gpg: Signature made Thu 15 Sep 2016 18:31:42 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-fixes-20160915.0:
  vfio/pci: Fix regression in MSI routing configuration

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-09-15 19:36:02 +01:00
parent 5f473241ac 6d17a018d0
commit ebc231d7da
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

@ -496,7 +496,9 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr,
vfio_update_kvm_msi_virq(vector, *msg, pdev);
}
} else {
vfio_add_kvm_msi_virq(vdev, vector, nr, true);
if (msg) {
vfio_add_kvm_msi_virq(vdev, vector, nr, true);
}
}
/*