diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-15 19:36:02 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-15 19:36:02 +0100 |
| commit | ebc231d7daf1f41b23d8b6a6d1234800b86e5fe2 (patch) | |
| tree | 9eff4066e8a48bf0832f9214a6f3c77824f2e647 | |
| parent | 5f473241ac595452ae0638dc63e7af2a2294f5ec (diff) | |
| parent | 6d17a018d09801a2b18133a4febd81433bb0cf85 (diff) | |
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>
| -rw-r--r-- | hw/vfio/pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 7bfa17ce38..a5a620a0c4 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -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); + } } /* |