From: "Longpeng(Mike)" <longpeng2@huawei.com>
To: <alex.williamson@redhat.com>, <philmd@redhat.com>,
<pbonzini@redhat.com>, <marcel.apfelbaum@gmail.com>,
<mst@redhat.com>
Cc: chenjiashang@huawei.com,
"Longpeng\(Mike\)" <longpeng2@huawei.com>,
arei.gonglei@huawei.com, qemu-devel@nongnu.org
Subject: [PATCH v3 3/9] vfio: simplify the failure path in vfio_msi_enable
Date: Tue, 21 Sep 2021 07:01:56 +0800 [thread overview]
Message-ID: <20210920230202.1439-4-longpeng2@huawei.com> (raw)
In-Reply-To: <20210920230202.1439-1-longpeng2@huawei.com>
Use vfio_msi_disable_common to simplify the error handling
in vfio_msi_enable.
Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
---
hw/vfio/pci.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 1e6797fd4b..8e97ca93cf 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -47,6 +47,7 @@
static void vfio_disable_interrupts(VFIOPCIDevice *vdev);
static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled);
+static void vfio_msi_disable_common(VFIOPCIDevice *vdev);
/*
* Disabling BAR mmaping can be slow, but toggling it around INTx can
@@ -655,24 +656,12 @@ retry:
"MSI vectors, retry with %d", vdev->nr_vectors, ret);
}
- for (i = 0; i < vdev->nr_vectors; i++) {
- VFIOMSIVector *vector = &vdev->msi_vectors[i];
- if (vector->virq >= 0) {
- vfio_remove_kvm_msi_virq(vector);
- }
- qemu_set_fd_handler(event_notifier_get_fd(&vector->interrupt),
- NULL, NULL, NULL);
- event_notifier_cleanup(&vector->interrupt);
- }
-
- g_free(vdev->msi_vectors);
- vdev->msi_vectors = NULL;
+ vfio_msi_disable_common(vdev);
if (ret > 0) {
vdev->nr_vectors = ret;
goto retry;
}
- vdev->nr_vectors = 0;
/*
* Failing to setup MSI doesn't really fall within any specification.
@@ -680,7 +669,6 @@ retry:
* out to fall back to INTx for this device.
*/
error_report("vfio: Error: Failed to enable MSI");
- vdev->interrupt = VFIO_INT_NONE;
return;
}
--
2.23.0
next prev parent reply other threads:[~2021-09-20 23:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 23:01 [PATCH v3 0/9] optimize the downtime for vfio migration Longpeng(Mike)
2021-09-20 23:01 ` [PATCH v3 1/9] vfio: simplify the conditional statements in vfio_msi_enable Longpeng(Mike)
2021-09-20 23:01 ` [PATCH v3 2/9] vfio: move re-enabling INTX out of the common helper Longpeng(Mike)
2021-09-20 23:01 ` Longpeng(Mike) [this message]
2021-09-20 23:01 ` [PATCH v3 4/9] msix: simplify the conditional in msix_set/unset_vector_notifiers Longpeng(Mike)
2021-10-01 23:04 ` Alex Williamson
2021-10-08 1:02 ` Longpeng (Mike, Cloud Infrastructure Service Product Dept.)
2021-09-20 23:01 ` [PATCH v3 5/9] msix: reset poll_notifier to NULL if fail to set notifiers Longpeng(Mike)
2021-09-20 23:01 ` [PATCH v3 6/9] kvm: irqchip: extract kvm_irqchip_add_deferred_msi_route Longpeng(Mike)
2021-09-20 23:02 ` [PATCH v3 7/9] vfio: add infrastructure to commit the deferred kvm routing Longpeng(Mike)
2021-10-01 23:04 ` Alex Williamson
2021-10-08 1:26 ` Longpeng (Mike, Cloud Infrastructure Service Product Dept.)
2021-09-20 23:02 ` [PATCH v3 8/9] Revert "vfio: Avoid disabling and enabling vectors repeatedly in VFIO migration" Longpeng(Mike)
2021-10-01 23:04 ` Alex Williamson
2021-10-08 1:32 ` Longpeng (Mike, Cloud Infrastructure Service Product Dept.)
2021-09-20 23:02 ` [PATCH v3 9/9] vfio: defer to commit kvm irq routing when enable msi/msix Longpeng(Mike)
2021-10-01 23:04 ` Alex Williamson
2021-10-05 13:10 ` Longpeng (Mike, Cloud Infrastructure Service Product Dept.)
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=20210920230202.1439-4-longpeng2@huawei.com \
--to=longpeng2@huawei.com \
--cc=alex.williamson@redhat.com \
--cc=arei.gonglei@huawei.com \
--cc=chenjiashang@huawei.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.