[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 18/19] block/nvme: Switch to using the MSIX API
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 18/19] block/nvme: Switch to using the MSIX API |
Date: |
Mon, 26 Oct 2020 11:55:03 +0100 |
In preparation of using multiple IRQs, switch to using the recently
introduced MSIX API. Instead of allocating and assigning IRQ in
a single step, we now have to use two distinct calls.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index 46b09b3a3a7..191678540b6 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -693,6 +693,7 @@ static int nvme_init(BlockDriverState *bs, const char
*device, int namespace,
size_t device_page_size_min;
size_t device_page_size_max;
size_t iommu_page_size_min = 4096;
+ unsigned irq_count = MSIX_IRQ_COUNT;
qemu_co_mutex_init(&s->dma_map_lock);
qemu_co_queue_init(&s->dma_flush_queue);
@@ -809,8 +810,17 @@ static int nvme_init(BlockDriverState *bs, const char
*device, int namespace,
}
}
- ret = qemu_vfio_pci_init_irq(s->vfio, s->irq_notifier,
- VFIO_PCI_MSIX_IRQ_INDEX, errp);
+ ret = qemu_vfio_pci_msix_init_irqs(s->vfio, &irq_count, errp);
+ if (ret) {
+ if (ret == -EOVERFLOW) {
+ error_append_hint(errp, "%u IRQs requested but only %u
available\n",
+ MSIX_IRQ_COUNT, irq_count);
+ }
+ goto out;
+ }
+
+ ret = qemu_vfio_pci_msix_set_irq(s->vfio, MSIX_SHARED_IRQ_IDX,
+ s->irq_notifier, errp);
if (ret) {
goto out;
}
--
2.26.2
- Re: [PATCH v2 12/19] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error, (continued)
- [PATCH v2 13/19] util/vfio-helpers: Let qemu_vfio_verify_mappings() use error_report(), Philippe Mathieu-Daudé, 2020/10/26
- [PATCH v2 14/19] util/vfio-helpers: Pass minimum page size to qemu_vfio_open_pci(), Philippe Mathieu-Daudé, 2020/10/26
- [PATCH v2 15/19] util/vfio-helpers: Report error when IOMMU page size is not supported, Philippe Mathieu-Daudé, 2020/10/26
- [PATCH v2 16/19] util/vfio-helpers: Introduce qemu_vfio_pci_msix_init_irqs(), Philippe Mathieu-Daudé, 2020/10/26
- [PATCH v2 17/19] util/vfio-helpers: Introduce qemu_vfio_pci_msix_set_irq(), Philippe Mathieu-Daudé, 2020/10/26
- [PATCH v2 18/19] block/nvme: Switch to using the MSIX API,
Philippe Mathieu-Daudé <=
- [PATCH v2 19/19] util/vfio-helpers: Remove now unused qemu_vfio_pci_init_irq(), Philippe Mathieu-Daudé, 2020/10/26
- Re: [PATCH v2 00/19] util/vfio-helpers: Allow using multiple MSIX IRQs, Stefan Hajnoczi, 2020/10/27