]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
vfio: simplify the conditional statements in vfio_msi_enable
authorLongpeng(Mike) <longpeng2@huawei.com>
Sat, 26 Mar 2022 06:02:22 +0000 (14:02 +0800)
committerAlex Williamson <alex.williamson@redhat.com>
Fri, 6 May 2022 15:06:50 +0000 (09:06 -0600)
It's unnecessary to test against the specific return value of
VFIO_DEVICE_SET_IRQS, since any positive return is an error
indicating the number of vectors we should retry with.

Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
Link: https://lore.kernel.org/r/20220326060226.1892-2-longpeng2@huawei.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
hw/vfio/pci.c

index 9fd9faee1d149d788da93a1254f1cfe8ae850902..cab1a6ef57f1e61118e880fd33fb299b1666328b 100644 (file)
@@ -653,7 +653,7 @@ retry:
     if (ret) {
         if (ret < 0) {
             error_report("vfio: Error: Failed to setup MSI fds: %m");
-        } else if (ret != vdev->nr_vectors) {
+        } else {
             error_report("vfio: Error: Failed to enable %d "
                          "MSI vectors, retry with %d", vdev->nr_vectors, ret);
         }
@@ -671,7 +671,7 @@ retry:
         g_free(vdev->msi_vectors);
         vdev->msi_vectors = NULL;
 
-        if (ret > 0 && ret != vdev->nr_vectors) {
+        if (ret > 0) {
             vdev->nr_vectors = ret;
             goto retry;
         }