[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/11] vfio: simplify the conditional statements in vfio_msi_enabl
From: |
Alex Williamson |
Subject: |
[PULL 01/11] vfio: simplify the conditional statements in vfio_msi_enable |
Date: |
Fri, 06 May 2022 14:46:47 -0600 |
User-agent: |
StGit/1.0-8-g6af9-dirty |
From: Longpeng(Mike) <longpeng2@huawei.com>
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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 9fd9faee1d14..cab1a6ef57f1 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;
}
- [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 <=
- [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, 2022/05/06
- [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