From: "Longpeng(Mike)" <longpeng2@huawei.com>
To: <alex.williamson@redhat.com>, <pbonzini@redhat.com>
Cc: <qemu-devel@nongnu.org>, <kvm@vger.kernel.org>,
<arei.gonglei@huawei.com>,
"Longpeng(Mike)" <longpeng2@huawei.com>
Subject: [PATCH v5 1/6] vfio: simplify the conditional statements in vfio_msi_enable
Date: Wed, 3 Nov 2021 16:16:52 +0800 [thread overview]
Message-ID: <20211103081657.1945-2-longpeng2@huawei.com> (raw)
In-Reply-To: <20211103081657.1945-1-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>
---
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 5cdf1d4..dd30806 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
next prev parent reply other threads:[~2021-11-03 8:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-03 8:16 [PATCH v5 0/6] optimize the downtime for vfio migration Longpeng(Mike)
2021-11-03 8:16 ` Longpeng(Mike) [this message]
2021-11-03 8:16 ` [PATCH v5 2/6] vfio: move re-enabling INTX out of the common helper Longpeng(Mike)
2021-11-03 8:16 ` [PATCH v5 3/6] vfio: simplify the failure path in vfio_msi_enable Longpeng(Mike)
2021-11-03 8:16 ` [PATCH v5 4/6] kvm: irqchip: extract kvm_irqchip_add_deferred_msi_route Longpeng(Mike)
2021-11-12 3:59 ` Longpeng (Mike, Cloud Infrastructure Service Product Dept.)
2021-11-12 9:31 ` Paolo Bonzini
2021-11-13 9:21 ` Longpeng (Mike, Cloud Infrastructure Service Product Dept.)
2021-11-03 8:16 ` [PATCH v5 5/6] Revert "vfio: Avoid disabling and enabling vectors repeatedly in VFIO migration" Longpeng(Mike)
2021-11-03 8:16 ` [PATCH v5 6/6] vfio: defer to commit kvm irq routing when enable msi/msix Longpeng(Mike)
2021-11-03 20:36 ` [PATCH v5 0/6] optimize the downtime for vfio migration Alex Williamson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211103081657.1945-2-longpeng2@huawei.com \
--to=longpeng2@huawei.com \
--cc=alex.williamson@redhat.com \
--cc=arei.gonglei@huawei.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).