diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-04 13:05:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-04 13:05:14 +0100 |
| commit | 5c6a9dbef9ab2b978c61b8ed13d79dceb2c3ef46 (patch) | |
| tree | f3303172f8c84a02889cd840bb712c2024f6b73f | |
| parent | 3eb98f760e54f897a7ecf88e63f9eade6b00f614 (diff) | |
| parent | 5053bd781143c354dfe3c8747d6c013dc22851b6 (diff) | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20190702.0' into staging
VFIO fixes 2019-07-02
- Remove outdated comment (Fabiano Rosas)
- Log MSI-X eventfd switch failure, fix Coverity issue (Eric Auger)
# gpg: Signature made Tue 02 Jul 2019 23:21:56 BST
# gpg: using RSA key 239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>" [full]
# gpg: aka "Alex Williamson <alex@shazbot.org>" [full]
# gpg: aka "Alex Williamson <alwillia@redhat.com>" [full]
# gpg: aka "Alex Williamson <alex.l.williamson@gmail.com>" [full]
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B 8A90 239B 9B6E 3BB0 8B22
* remotes/awilliam/tags/vfio-fixes-20190702.0:
vfio/pci: Trace vfio_set_irq_signaling() failure in vfio_msix_vector_release()
vfio-common.h: Remove inaccurate comment
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/vfio/pci.c | 7 | ||||
| -rw-r--r-- | include/hw/vfio/vfio-common.h | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index ce3fe96efe..d7a4e1875c 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -551,9 +551,12 @@ static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr) */ if (vector->virq >= 0) { int32_t fd = event_notifier_get_fd(&vector->interrupt); + Error *err = NULL; - vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_MSIX_IRQ_INDEX, nr, - VFIO_IRQ_SET_ACTION_TRIGGER, fd, NULL); + if (vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_MSIX_IRQ_INDEX, nr, + VFIO_IRQ_SET_ACTION_TRIGGER, fd, &err)) { + error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); + } } } diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index a88b69b675..9107bd41c0 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -74,11 +74,6 @@ typedef struct VFIOContainer { int error; bool initialized; unsigned long pgsizes; - /* - * This assumes the host IOMMU can support only a single - * contiguous IOVA window. We may need to generalize that in - * future - */ QLIST_HEAD(, VFIOGuestIOMMU) giommu_list; QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list; QLIST_HEAD(, VFIOGroup) group_list; |