From a6f5770fb2b22cb219a684469c8224ebec74ca2e Mon Sep 17 00:00:00 2001 From: "Longpeng(Mike)" Date: Sat, 26 Mar 2022 14:02:22 +0800 Subject: [PATCH] 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) Link: https://lore.kernel.org/r/20220326060226.1892-2-longpeng2@huawei.com Signed-off-by: Alex Williamson --- hw/vfio/pci.c | 4 ++-- 1 file 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; }