[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/9] vfio: simplify the conditional statements in vfio_msi_ena
From: |
Longpeng(Mike) |
Subject: |
[PATCH v2 1/9] vfio: simplify the conditional statements in vfio_msi_enable |
Date: |
Thu, 9 Sep 2021 14:06:05 +0800 |
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>
---
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 e1ea1d8..f7a3a13 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -650,7 +650,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);
}
@@ -668,7 +668,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;
}
--
1.8.3.1
- [PATCH v2 0/9] optimize the downtime for vfio migration, Longpeng(Mike), 2021/09/09
- [PATCH v2 5/9] msix: reset poll_notifier to NULL if fail to set notifiers, Longpeng(Mike), 2021/09/09
- [PATCH v2 6/9] kvm: irqchip: extract kvm_irqchip_add_deferred_msi_route, Longpeng(Mike), 2021/09/09
- [PATCH v2 8/9] Revert "vfio: Avoid disabling and enabling vectors repeatedly in VFIO migration", Longpeng(Mike), 2021/09/09
- [PATCH v2 1/9] vfio: simplify the conditional statements in vfio_msi_enable,
Longpeng(Mike) <=
- [PATCH v2 2/9] vfio: move re-enabling INTX out of the common helper, Longpeng(Mike), 2021/09/09
- [PATCH v2 4/9] msix: simplify the conditional in msix_set/unset_vector_notifiers, Longpeng(Mike), 2021/09/09
- [PATCH v2 3/9] vfio: simplify the failure path in vfio_msi_enable, Longpeng(Mike), 2021/09/09
- [PATCH v2 9/9] vfio: defer to commit kvm irq routing when enable msi/msix, Longpeng(Mike), 2021/09/09
- [PATCH v2 7/9] vfio: add infrastructure to commit the deferred kvm routing, Longpeng(Mike), 2021/09/09
- Re: [PATCH v2 0/9] optimize the downtime for vfio migration, Longpeng (Mike, Cloud Infrastructure Service Product Dept.), 2021/09/20