[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/16] util/vfio-helpers: Remove now unused qemu_vfio_pci_init_ir
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 16/16] util/vfio-helpers: Remove now unused qemu_vfio_pci_init_irq() |
Date: |
Tue, 20 Oct 2020 19:24:28 +0200 |
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
- [PATCH 11/16] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error, (continued)
- [PATCH 11/16] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 12/16] util/vfio-helpers: Let qemu_vfio_verify_mappings() use error_report(), Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 13/16] util/vfio-helpers: Introduce qemu_vfio_pci_msix_init_irqs(), Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 15/16] block/nvme: Switch to using the MSIX API, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 14/16] util/vfio-helpers: Introduce qemu_vfio_pci_msix_set_irq(), Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 16/16] util/vfio-helpers: Remove now unused qemu_vfio_pci_init_irq(),
Philippe Mathieu-Daudé <=