[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/11] vfio: simplify the failure path in vfio_msi_enable
From: |
Alex Williamson |
Subject: |
[PULL 03/11] vfio: simplify the failure path in vfio_msi_enable |
Date: |
Fri, 06 May 2022 14:47:04 -0600 |
User-agent: |
StGit/1.0-8-g6af9-dirty |
From: Longpeng(Mike) <longpeng2@huawei.com>
Use vfio_msi_disable_common to simplify the error handling
in vfio_msi_enable.
Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
Link: https://lore.kernel.org/r/20220326060226.1892-4-longpeng2@huawei.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.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 b3c27c22aaeb..50562629ea8f 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
@@ -658,24 +659,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.
@@ -683,7 +672,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;
}
- [PULL 00/11] Series short description, Alex Williamson, 2022/05/06
- [PULL 01/11] vfio: simplify the conditional statements in vfio_msi_enable, Alex Williamson, 2022/05/06
- [PULL 02/11] vfio: move re-enabling INTX out of the common helper, Alex Williamson, 2022/05/06
- [PULL 03/11] vfio: simplify the failure path in vfio_msi_enable,
Alex Williamson <=
- [PULL 04/11] Revert "vfio: Avoid disabling and enabling vectors repeatedly in VFIO migration", Alex Williamson, 2022/05/06
- [PULL 05/11] vfio: defer to commit kvm irq routing when enable msi/msix, Alex Williamson, 2022/05/06
- [PULL 06/11] vfio/common: Fix a small boundary issue of a trace, Alex Williamson, 2022/05/06
- [PULL 07/11] sysemu: tpm: Add a stub function for TPM_IS_CRB, Alex Williamson, 2022/05/06
- [PULL 08/11] vfio/common: remove spurious tpm-crb-cmd misalignment warning, Alex Williamson, 2022/05/06
- [PULL 09/11] hw/vfio/pci: fix vfio_pci_hot_reset_result trace point, Alex Williamson, 2022/05/06
- [PULL 10/11] vfio/pci: Use vbasedev local variable in vfio_realize(), Alex Williamson, 2022/05/06