summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLongpeng(Mike) <longpeng2@huawei.com>2022-03-26 14:02:22 +0800
committerAlex Williamson <alex.williamson@redhat.com>2022-05-06 09:06:50 -0600
commita6f5770fb2b22cb219a684469c8224ebec74ca2e (patch)
tree2b1e44d121850c1d9666a00f5791d56af19bc165
parent31abf61c4929a91275fe32f1fafe6e6b3e840b2a (diff)
downloadfocaccia-qemu-a6f5770fb2b22cb219a684469c8224ebec74ca2e.tar.gz
focaccia-qemu-a6f5770fb2b22cb219a684469c8224ebec74ca2e.zip
vfio: simplify the conditional statements in vfio_msi_enable
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>
-rw-r--r--hw/vfio/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 9fd9faee1d..cab1a6ef57 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -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;
         }