SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vfio: simplify the failure path in vfio_msi_enable

Browse Source 
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>
This commit is contained in:
Longpeng(Mike) 2022-03-26 14:02:24 +08:00 committed by Alex Williamson
parent be4a46eccf
commit 8ab217d5d3
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/vfio/pci.c
View File

@ -47,6 +47,7 @@
static void vfio_disable_interrupts(VFIOPCIDevice *vdev); static void vfio_disable_interrupts(VFIOPCIDevice *vdev);
static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled); 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 * 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); "MSI vectors, retry with %d", vdev->nr_vectors, ret);
} }
for (i = 0; i < vdev->nr_vectors; i++) { vfio_msi_disable_common(vdev);
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;
if (ret > 0) { if (ret > 0) {
vdev->nr_vectors = ret; vdev->nr_vectors = ret;
goto retry; goto retry;
} }
vdev->nr_vectors = 0;
/* /*
* Failing to setup MSI doesn't really fall within any specification. * 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. * out to fall back to INTx for this device.
*/ */
error_report("vfio: Error: Failed to enable MSI"); error_report("vfio: Error: Failed to enable MSI");
vdev->interrupt = VFIO_INT_NONE;
return; return;
} }