[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/11] block/nvme: Have nvme_create_queue_pair() report errors con
From: |
Stefan Hajnoczi |
Subject: |
[PULL 05/11] block/nvme: Have nvme_create_queue_pair() report errors consistently |
Date: |
Tue, 7 Sep 2021 09:13:57 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
nvme_create_queue_pair() does not return a boolean value (indicating
eventual error) but a pointer, and is inconsistent in how it fills the
error handler. To fulfill callers expectations, always set an error
message on failure.
Reported-by: Auger Eric <eric.auger@redhat.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210902070025.197072-6-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/nvme.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/block/nvme.c b/block/nvme.c
index e8dbbc2317..0786c501e4 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -220,6 +220,7 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState
*s,
q = g_try_new0(NVMeQueuePair, 1);
if (!q) {
+ error_setg(errp, "Cannot allocate queue pair");
return NULL;
}
trace_nvme_create_queue_pair(idx, q, size, aio_context,
@@ -228,6 +229,7 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState
*s,
qemu_real_host_page_size);
q->prp_list_pages = qemu_try_memalign(qemu_real_host_page_size, bytes);
if (!q->prp_list_pages) {
+ error_setg(errp, "Cannot allocate PRP page list");
goto fail;
}
memset(q->prp_list_pages, 0, bytes);
@@ -239,6 +241,7 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState
*s,
r = qemu_vfio_dma_map(s->vfio, q->prp_list_pages, bytes,
false, &prp_list_iova);
if (r) {
+ error_setg_errno(errp, -r, "Cannot map buffer for DMA");
goto fail;
}
q->free_req_head = -1;
--
2.31.1
- [PULL 00/11] Block patches, Stefan Hajnoczi, 2021/09/07
- [PULL 01/11] block/nvme: Use safer trace format string, Stefan Hajnoczi, 2021/09/07
- [PULL 04/11] util/vfio-helpers: Remove unreachable code in qemu_vfio_dma_map(), Stefan Hajnoczi, 2021/09/07
- [PULL 02/11] util/vfio-helpers: Let qemu_vfio_verify_mappings() use error_report(), Stefan Hajnoczi, 2021/09/07
- [PULL 05/11] block/nvme: Have nvme_create_queue_pair() report errors consistently,
Stefan Hajnoczi <=
- [PULL 06/11] util/vfio-helpers: Pass Error handle to qemu_vfio_dma_map(), Stefan Hajnoczi, 2021/09/07
- [PULL 09/11] util/vfio-helpers: Simplify qemu_vfio_dma_map() returning directly, Stefan Hajnoczi, 2021/09/07
- [PULL 03/11] util/vfio-helpers: Replace qemu_mutex_lock() calls with QEMU_LOCK_GUARD, Stefan Hajnoczi, 2021/09/07
- [PULL 07/11] util/vfio-helpers: Extract qemu_vfio_water_mark_reached(), Stefan Hajnoczi, 2021/09/07
- [PULL 08/11] util/vfio-helpers: Use error_setg in qemu_vfio_find_[fixed/temp]_iova, Stefan Hajnoczi, 2021/09/07
- [PULL 10/11] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error, Stefan Hajnoczi, 2021/09/07
- [PULL 11/11] block/nvme: Only report VFIO error on failed retry, Stefan Hajnoczi, 2021/09/07
- Re: [PULL 00/11] Block patches, Peter Maydell, 2021/09/07