From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>,
qemu-block@nongnu.org, "Max Reitz" <mreitz@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 16/16] util/vfio-helpers: Remove now unused qemu_vfio_pci_init_irq()
Date: Tue, 20 Oct 2020 19:24:28 +0200 [thread overview]
Message-ID: <20201020172428.2220726-17-philmd@redhat.com> (raw)
In-Reply-To: <20201020172428.2220726-1-philmd@redhat.com>
Our only user, the NVMe block driver, switched to the MSIX API.
As this function is now unused, remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/qemu/vfio-helpers.h | 2 --
util/vfio-helpers.c | 43 -------------------------------------
2 files changed, 45 deletions(-)
diff --git a/include/qemu/vfio-helpers.h b/include/qemu/vfio-helpers.h
index 4c06694e03a..f42371d25d6 100644
--- a/include/qemu/vfio-helpers.h
+++ b/include/qemu/vfio-helpers.h
@@ -29,8 +29,6 @@ void *qemu_vfio_pci_map_bar(QEMUVFIOState *s, int index,
Error **errp);
void qemu_vfio_pci_unmap_bar(QEMUVFIOState *s, int index, void *bar,
uint64_t offset, uint64_t size);
-int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNotifier *e,
- int irq_type, Error **errp);
int qemu_vfio_pci_msix_init_irqs(QEMUVFIOState *s,
unsigned *irq_count, Error **errp);
int qemu_vfio_pci_msix_set_irq(QEMUVFIOState *s, unsigned irq_index,
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index 18142e6be86..83d6eef13fb 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -189,49 +189,6 @@ void qemu_vfio_pci_unmap_bar(QEMUVFIOState *s, int index, void *bar,
}
}
-/**
- * Initialize device IRQ with @irq_type and register an event notifier.
- */
-int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNotifier *e,
- int irq_type, Error **errp)
-{
- int r;
- struct vfio_irq_set *irq_set;
- size_t irq_set_size;
- struct vfio_irq_info irq_info = { .argsz = sizeof(irq_info) };
-
- irq_info.index = irq_type;
- if (ioctl(s->device, VFIO_DEVICE_GET_IRQ_INFO, &irq_info)) {
- error_setg_errno(errp, errno, "Failed to get device interrupt info");
- return -errno;
- }
- if (!(irq_info.flags & VFIO_IRQ_INFO_EVENTFD)) {
- error_setg(errp, "Device interrupt doesn't support eventfd");
- return -EINVAL;
- }
-
- irq_set_size = sizeof(*irq_set) + sizeof(int);
- irq_set = g_malloc0(irq_set_size);
-
- /* Get to a known IRQ state */
- *irq_set = (struct vfio_irq_set) {
- .argsz = irq_set_size,
- .flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER,
- .index = irq_info.index,
- .start = 0,
- .count = 1,
- };
-
- *(int *)&irq_set->data = event_notifier_get_fd(e);
- r = ioctl(s->device, VFIO_DEVICE_SET_IRQS, irq_set);
- g_free(irq_set);
- if (r) {
- error_setg_errno(errp, errno, "Failed to setup device interrupt");
- return -errno;
- }
- return 0;
-}
-
/**
* Initialize a MSIX IRQ and register its event notifier.
* @irq_index: MSIX IRQ index
--
2.26.2
next prev parent reply other threads:[~2020-10-20 17:35 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 17:24 [PATCH 00/16] util/vfio-helpers: Allow using multiple MSIX IRQs Philippe Mathieu-Daudé
2020-10-20 17:24 ` [PATCH 01/16] block/nvme: Correct minimum device page size Philippe Mathieu-Daudé
2020-10-22 13:52 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 02/16] util/vfio-helpers: Improve reporting unsupported IOMMU type Philippe Mathieu-Daudé
2020-10-22 13:53 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 03/16] util/vfio-helpers: Pass minimum page size to qemu_vfio_open_pci() Philippe Mathieu-Daudé
2020-10-22 14:00 ` Stefan Hajnoczi
2020-10-24 19:52 ` Philippe Mathieu-Daudé
2020-10-20 17:24 ` [PATCH 04/16] util/vfio-helpers: Report error when IOMMU page size is not supported Philippe Mathieu-Daudé
2020-10-22 15:21 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 05/16] util/vfio-helpers: Trace PCI I/O config accesses Philippe Mathieu-Daudé
2020-10-22 14:13 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 06/16] util/vfio-helpers: Trace PCI BAR region info Philippe Mathieu-Daudé
2020-10-22 14:13 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 07/16] util/vfio-helpers: Trace where BARs are mapped Philippe Mathieu-Daudé
2020-10-22 14:13 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 08/16] util/vfio-helpers: Improve DMA trace events Philippe Mathieu-Daudé
2020-10-22 14:17 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 09/16] util/vfio-helpers: Convert vfio_dump_mapping to " Philippe Mathieu-Daudé
2020-10-22 14:20 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 10/16] util/vfio-helpers: Let qemu_vfio_dma_map() propagate Error Philippe Mathieu-Daudé
2020-10-22 14:23 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 11/16] util/vfio-helpers: Let qemu_vfio_do_mapping() " Philippe Mathieu-Daudé
2020-10-22 14:24 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 12/16] util/vfio-helpers: Let qemu_vfio_verify_mappings() use error_report() Philippe Mathieu-Daudé
2020-10-22 14:25 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 13/16] util/vfio-helpers: Introduce qemu_vfio_pci_msix_init_irqs() Philippe Mathieu-Daudé
2020-10-22 14:34 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 14/16] util/vfio-helpers: Introduce qemu_vfio_pci_msix_set_irq() Philippe Mathieu-Daudé
2020-10-22 14:47 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 15/16] block/nvme: Switch to using the MSIX API Philippe Mathieu-Daudé
2020-10-22 14:49 ` Stefan Hajnoczi
2020-10-20 17:24 ` Philippe Mathieu-Daudé [this message]
2020-10-22 14:50 ` [PATCH 16/16] util/vfio-helpers: Remove now unused qemu_vfio_pci_init_irq() Stefan Hajnoczi
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=20201020172428.2220726-17-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).