[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 20/22] hw/block/nvme: Verify msix_vector_use() returned value
From: |
Klaus Jensen |
Subject: |
[PATCH v7 20/22] hw/block/nvme: Verify msix_vector_use() returned value |
Date: |
Tue, 9 Jun 2020 21:03:31 +0200 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
msix_vector_use() returns -EINVAL on error. Assert it won't.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200602155709.9776-1-philmd@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
hw/block/nvme.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index e10fc774fc34..fe17aa5d7041 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -615,6 +615,10 @@ static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeCmd *cmd)
static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr,
uint16_t cqid, uint16_t vector, uint16_t size, uint16_t irq_enabled)
{
+ int ret;
+
+ ret = msix_vector_use(&n->parent_obj, vector);
+ assert(ret == 0);
cq->ctrl = n;
cq->cqid = cqid;
cq->size = size;
@@ -625,7 +629,6 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n,
uint64_t dma_addr,
cq->head = cq->tail = 0;
QTAILQ_INIT(&cq->req_list);
QTAILQ_INIT(&cq->sq_list);
- msix_vector_use(&n->parent_obj, cq->vector);
n->cq[cqid] = cq;
cq->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, nvme_post_cqes, cq);
}
--
2.27.0
- [PATCH v7 13/22] hw/block/nvme: add namespace helpers, (continued)
- [PATCH v7 13/22] hw/block/nvme: add namespace helpers, Klaus Jensen, 2020/06/09
- [PATCH v7 10/22] hw/block/nvme: factor out property/constraint checks, Klaus Jensen, 2020/06/09
- [PATCH v7 11/22] hw/block/nvme: factor out device state setup, Klaus Jensen, 2020/06/09
- [PATCH v7 16/22] hw/block/nvme: factor out cmb setup, Klaus Jensen, 2020/06/09
- [PATCH v7 15/22] hw/block/nvme: factor out pci setup, Klaus Jensen, 2020/06/09
- [PATCH v7 14/22] hw/block/nvme: factor out namespace setup, Klaus Jensen, 2020/06/09
- [PATCH v7 17/22] hw/block/nvme: factor out pmr setup, Klaus Jensen, 2020/06/09
- [PATCH v7 19/22] hw/block/nvme: factor out controller identify setup, Klaus Jensen, 2020/06/09
- [PATCH v7 21/22] hw/block/nvme: add msix_qsize parameter, Klaus Jensen, 2020/06/09
- [PATCH v7 12/22] hw/block/nvme: factor out block backend setup, Klaus Jensen, 2020/06/09
- [PATCH v7 20/22] hw/block/nvme: Verify msix_vector_use() returned value,
Klaus Jensen <=
- [PATCH v7 18/22] hw/block/nvme: do cmb/pmr init as part of pci init, Klaus Jensen, 2020/06/09
- [PATCH v7 22/22] hw/block/nvme: verify msix_init_exclusive_bar() return value, Klaus Jensen, 2020/06/09
- Re: [PATCH v7 00/22] nvme: small fixes, refactoring and cleanups, Kevin Wolf, 2020/06/15