diff options
| author | Longpeng(Mike) | 2022-03-26 07:02:23 +0100 |
|---|---|---|
| committer | Alex Williamson | 2022-05-06 17:06:50 +0200 |
| commit | be4a46eccfe97069fd62f967f6660407c9aa2a03 (patch) | |
| tree | cd21f4ef034c6a75429b938e137004fed6d2ff5c /hw/vfio | |
| parent | vfio: simplify the conditional statements in vfio_msi_enable (diff) | |
| download | qemu-be4a46eccfe97069fd62f967f6660407c9aa2a03.tar.gz qemu-be4a46eccfe97069fd62f967f6660407c9aa2a03.tar.xz qemu-be4a46eccfe97069fd62f967f6660407c9aa2a03.zip | |
vfio: move re-enabling INTX out of the common helper
Move re-enabling INTX out, and the callers should decide to
re-enable it or not.
Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
Link: https://lore.kernel.org/r/20220326060226.1892-3-longpeng2@huawei.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'hw/vfio')
| -rw-r--r-- | hw/vfio/pci.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index cab1a6ef57..b3c27c22aa 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -693,7 +693,6 @@ retry: static void vfio_msi_disable_common(VFIOPCIDevice *vdev) { - Error *err = NULL; int i; for (i = 0; i < vdev->nr_vectors; i++) { @@ -712,15 +711,11 @@ static void vfio_msi_disable_common(VFIOPCIDevice *vdev) vdev->msi_vectors = NULL; vdev->nr_vectors = 0; vdev->interrupt = VFIO_INT_NONE; - - vfio_intx_enable(vdev, &err); - if (err) { - error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); - } } static void vfio_msix_disable(VFIOPCIDevice *vdev) { + Error *err = NULL; int i; msix_unset_vector_notifiers(&vdev->pdev); @@ -741,6 +736,10 @@ static void vfio_msix_disable(VFIOPCIDevice *vdev) } vfio_msi_disable_common(vdev); + vfio_intx_enable(vdev, &err); + if (err) { + error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); + } memset(vdev->msix->pending, 0, BITS_TO_LONGS(vdev->msix->entries) * sizeof(unsigned long)); @@ -750,8 +749,14 @@ static void vfio_msix_disable(VFIOPCIDevice *vdev) static void vfio_msi_disable(VFIOPCIDevice *vdev) { + Error *err = NULL; + vfio_disable_irqindex(&vdev->vbasedev, VFIO_PCI_MSI_IRQ_INDEX); vfio_msi_disable_common(vdev); + vfio_intx_enable(vdev, &err); + if (err) { + error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); + } trace_vfio_msi_disable(vdev->vbasedev.name); } |