Re: [PATCH 15/16] block/nvme: Switch to using the MSIX API

[Stefan Hajnoczi]

On Tue, Oct 20, 2020 at 07:24:27PM +0200, Philippe Mathieu-Daudé wrote:
> 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.
> 
> Signed-off-by: Philippe Mathieu-Daudé 
> ---
>  block/nvme.c | 14 --
>  1 file changed, 12 insertions(+), 2 deletions(-)

Reviewed-by: Stefan Hajnoczi 


signature.asc
Description: PGP signature

[PATCH 15/16] block/nvme: Switch to using the MSIX API

[Philippe Mathieu-Daudé]

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.

Signed-off-by: Philippe Mathieu-Daudé 
---
 block/nvme.c | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/block/nvme.c b/block/nvme.c
index 428cda620df..a5518ad5bac 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -691,6 +691,7 @@ static int nvme_init(BlockDriverState *bs, const char 
*device, int namespace,
 Error *local_err = NULL;
 volatile NvmeBar *regs = NULL;
 size_t min_page_size = 4096;
+unsigned irq_count = MSIX_IRQ_COUNT;
 
 qemu_co_mutex_init(>dma_map_lock);
 qemu_co_queue_init(>dma_flush_queue);
@@ -784,8 +785,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, _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