ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Klaus Jensen 2024-11-10 20:26:23 +01:00
parent 9162f10125
commit 149f6e90b5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/nvme/ctrl.c
View File

@ -5423,7 +5423,7 @@ static void nvme_free_cq(NvmeCQueue *cq, NvmeCtrl *n)
event_notifier_set_handler(&cq->notifier, NULL); event_notifier_set_handler(&cq->notifier, NULL);
event_notifier_cleanup(&cq->notifier); event_notifier_cleanup(&cq->notifier);
} }
if (msix_enabled(pci)) { if (msix_enabled(pci) && cq->irq_enabled) {
msix_vector_unuse(pci, cq->vector); msix_vector_unuse(pci, cq->vector);
} }
if (cq->cqid) { 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); PCIDevice *pci = PCI_DEVICE(n);
if (msix_enabled(pci)) { if (msix_enabled(pci) && irq_enabled) {
msix_vector_use(pci, vector); msix_vector_use(pci, vector);
} }
cq->ctrl = n; cq->ctrl = n;
cq->cqid = cqid; cq->cqid = cqid;
cq->size = size; cq->size = size;