diff options
| author | Klaus Jensen <k.jensen@samsung.com> | 2024-11-10 20:26:23 +0100 |
|---|---|---|
| committer | Klaus Jensen <k.jensen@samsung.com> | 2024-12-03 07:28:27 +0100 |
| commit | 149f6e90b5b5689a4089a3432d83247d9f659684 (patch) | |
| tree | 7ad6158124963b20206328908077d707a2310ef8 | |
| parent | 9162f101257639cc4c7e20f72f77268b1256dd79 (diff) | |
| download | qemu-149f6e90b5b5689a4089a3432d83247d9f659684.zip qemu-149f6e90b5b5689a4089a3432d83247d9f659684.tar.gz qemu-149f6e90b5b5689a4089a3432d83247d9f659684.tar.bz2 | |
hw/nvme: fix use/unuse of msix vectors
Only call msix_{un,}use_vector() when interrupts are actually enabled
for a completion queue.
Reviewed-by: Jesper Wendel Devantier <foss@defmacro.it>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
| -rw-r--r-- | hw/nvme/ctrl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 13898d5..a38f460 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -5423,7 +5423,7 @@ static void nvme_free_cq(NvmeCQueue *cq, NvmeCtrl *n) event_notifier_set_handler(&cq->notifier, NULL); event_notifier_cleanup(&cq->notifier); } - if (msix_enabled(pci)) { + if (msix_enabled(pci) && cq->irq_enabled) { msix_vector_unuse(pci, cq->vector); } if (cq->cqid) { @@ -5464,9 +5464,10 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr, { PCIDevice *pci = PCI_DEVICE(n); - if (msix_enabled(pci)) { + if (msix_enabled(pci) && irq_enabled) { msix_vector_use(pci, vector); } + cq->ctrl = n; cq->cqid = cqid; cq->size = size; |