[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 3/6] vfio: simplify the failure path in vfio_msi_enable
From: |
Longpeng(Mike) |
Subject: |
[PATCH v4 3/6] vfio: simplify the failure path in vfio_msi_enable |
Date: |
Thu, 14 Oct 2021 08:48:49 +0800 |
Use vfio_msi_disable_common to simplify the error handling
in vfio_msi_enable.
Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
---
hw/vfio/pci.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index a4985c0..aeeb6cd 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -47,6 +47,7 @@
static void vfio_disable_interrupts(VFIOPCIDevice *vdev);
static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled);
+static void vfio_msi_disable_common(VFIOPCIDevice *vdev);
/*
* Disabling BAR mmaping can be slow, but toggling it around INTx can
@@ -655,24 +656,12 @@ retry:
"MSI vectors, retry with %d", vdev->nr_vectors, ret);
}
- for (i = 0; i < vdev->nr_vectors; i++) {
- VFIOMSIVector *vector = &vdev->msi_vectors[i];
- if (vector->virq >= 0) {
- vfio_remove_kvm_msi_virq(vector);
- }
- qemu_set_fd_handler(event_notifier_get_fd(&vector->interrupt),
- NULL, NULL, NULL);
- event_notifier_cleanup(&vector->interrupt);
- }
-
- g_free(vdev->msi_vectors);
- vdev->msi_vectors = NULL;
+ vfio_msi_disable_common(vdev);
if (ret > 0) {
vdev->nr_vectors = ret;
goto retry;
}
- vdev->nr_vectors = 0;
/*
* Failing to setup MSI doesn't really fall within any specification.
@@ -680,7 +669,6 @@ retry:
* out to fall back to INTx for this device.
*/
error_report("vfio: Error: Failed to enable MSI");
- vdev->interrupt = VFIO_INT_NONE;
return;
}
--
1.8.3.1
- [PATCH v4 0/6] optimize the downtime for vfio migration, Longpeng(Mike), 2021/10/13
- [PATCH v4 2/6] vfio: move re-enabling INTX out of the common helper, Longpeng(Mike), 2021/10/13
- [PATCH v4 4/6] kvm: irqchip: extract kvm_irqchip_add_deferred_msi_route, Longpeng(Mike), 2021/10/13
- [PATCH v4 5/6] Revert "vfio: Avoid disabling and enabling vectors repeatedly in VFIO migration", Longpeng(Mike), 2021/10/13
- [PATCH v4 6/6] vfio: defer to commit kvm irq routing when enable msi/msix, Longpeng(Mike), 2021/10/13
- [PATCH v4 1/6] vfio: simplify the conditional statements in vfio_msi_enable, Longpeng(Mike), 2021/10/13
- [PATCH v4 3/6] vfio: simplify the failure path in vfio_msi_enable,
Longpeng(Mike) <=