From: Alex Williamson <alex.williamson@redhat.com>
To: qemu-devel@nongnu.org
Cc: alex.williamson@redhat.com
Subject: [Qemu-devel] [PATCH 11/11] vfio-pci: Cleanup on INTx setup failure
Date: Thu, 04 Oct 2012 16:18:45 -0600 [thread overview]
Message-ID: <20121004221844.3189.88455.stgit@bling.home> (raw)
In-Reply-To: <20121004220545.3189.52569.stgit@bling.home>
Missing some unwind code.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
hw/vfio_pci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index b2383c4..2325272 100644
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -285,6 +285,8 @@ static int vfio_enable_intx(VFIODevice *vdev)
if (ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, &irq_set_fd)) {
error_report("vfio: Error: Failed to setup INTx fd: %m\n");
+ qemu_set_fd_handler(irq_set_fd.fd, NULL, NULL, vdev);
+ event_notifier_cleanup(&vdev->intx.interrupt);
return -errno;
}
prev parent reply other threads:[~2012-10-04 22:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-04 22:17 [Qemu-devel] [PATCH 00/11] vfio-pci cleanup and fixes Alex Williamson
2012-10-04 22:17 ` [Qemu-devel] [PATCH 01/11] vfio-pci: Update slow path INTx algorithm Alex Williamson
2012-10-04 22:17 ` [Qemu-devel] [PATCH 02/11] vfio-pci: Re-order map/unmap Alex Williamson
2012-10-04 22:17 ` [Qemu-devel] [PATCH 03/11] vfio-pci: Unmap and retry DMA mapping Alex Williamson
2012-10-04 22:17 ` [Qemu-devel] [PATCH 04/11] vfio-pci: Rework MSIX setup/teardown Alex Williamson
2012-10-04 22:18 ` [Qemu-devel] [PATCH 05/11] vfio-pci: No spurious MSIs Alex Williamson
2012-10-04 22:18 ` [Qemu-devel] [PATCH 06/11] vfio-pci: Roll the header into the .c file Alex Williamson
2012-10-04 22:18 ` [Qemu-devel] [PATCH 07/11] vfio-pci: Don't peak at msi_supported Alex Williamson
2012-10-04 22:18 ` [Qemu-devel] [PATCH 08/11] vfio-pci: Use uintptr_t for void* cast Alex Williamson
2012-10-04 22:18 ` [Qemu-devel] [PATCH 09/11] vfio-pci: Remove setting of MSI qsize Alex Williamson
2012-10-04 22:18 ` [Qemu-devel] [PATCH 10/11] vfio-pci: Extend reset Alex Williamson
2012-10-04 22:18 ` Alex Williamson [this message]
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=20121004221844.3189.88455.stgit@bling.home \
--to=alex.williamson@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).