[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-5.2 v2 11/25] block/nvme: Make nvme_init_queue() return boole
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-5.2 v2 11/25] block/nvme: Make nvme_init_queue() return boolean indicating error |
Date: |
Thu, 29 Oct 2020 10:32:52 +0100 |
Just for consistency, following the example documented since
commit e3fe3988d7 ("error: Document Error API usage rules"),
return a boolean value indicating an error is set or not.
Directly pass errp as the local_err is not requested in our
case. This simplifies a bit nvme_create_queue_pair().
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index 98335012457..6eaba4e7039 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -160,7 +160,8 @@ static QemuOptsList runtime_opts = {
},
};
-static void nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q,
+/* Returns true on success, false on failure. */
+static bool nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q,
unsigned nentries, size_t entry_bytes, Error
**errp)
{
size_t bytes;
@@ -171,13 +172,15 @@ static void nvme_init_queue(BDRVNVMeState *s, NVMeQueue
*q,
q->queue = qemu_try_memalign(s->page_size, bytes);
if (!q->queue) {
error_setg(errp, "Cannot allocate queue");
- return;
+ return false;
}
memset(q->queue, 0, bytes);
r = qemu_vfio_dma_map(s->vfio, q->queue, bytes, false, &q->iova);
if (r) {
error_setg(errp, "Cannot map queue");
+ return false;
}
+ return true;
}
static void nvme_free_queue_pair(NVMeQueuePair *q)
@@ -210,7 +213,6 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState
*s,
Error **errp)
{
int i, r;
- Error *local_err = NULL;
NVMeQueuePair *q;
uint64_t prp_list_iova;
@@ -247,16 +249,12 @@ static NVMeQueuePair
*nvme_create_queue_pair(BDRVNVMeState *s,
req->prp_list_iova = prp_list_iova + i * s->page_size;
}
- nvme_init_queue(s, &q->sq, size, NVME_SQ_ENTRY_BYTES, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
+ if (!nvme_init_queue(s, &q->sq, size, NVME_SQ_ENTRY_BYTES, errp)) {
goto fail;
}
q->sq.doorbell = &s->doorbells[idx * s->doorbell_scale].sq_tail;
- nvme_init_queue(s, &q->cq, size, NVME_CQ_ENTRY_BYTES, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
+ if (!nvme_init_queue(s, &q->cq, size, NVME_CQ_ENTRY_BYTES, errp)) {
goto fail;
}
q->cq.doorbell = &s->doorbells[idx * s->doorbell_scale].cq_head;
--
2.26.2
- [PATCH-for-5.2 v2 02/25] block/nvme: Use hex format to display offset in trace events, (continued)
- [PATCH-for-5.2 v2 02/25] block/nvme: Use hex format to display offset in trace events, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 03/25] block/nvme: Report warning with warn_report(), Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 04/25] block/nvme: Trace controller capabilities, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 05/25] block/nvme: Trace nvme_poll_queue() per queue, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 06/25] block/nvme: Improve nvme_free_req_queue_wait() trace information, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 07/25] block/nvme: Trace queue pair creation/deletion, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 08/25] block/nvme: Move definitions before structure declarations, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 09/25] block/nvme: Use unsigned integer for queue counter/size, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 10/25] block/nvme: Make nvme_identify() return boolean indicating error, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 11/25] block/nvme: Make nvme_init_queue() return boolean indicating error,
Philippe Mathieu-Daudé <=
- [PATCH-for-5.2 v2 12/25] block/nvme: Introduce Completion Queue definitions, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 13/25] block/nvme: Use definitions instead of magic values in add_io_queue(), Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 14/25] block/nvme: Correctly initialize Admin Queue Attributes, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 15/25] block/nvme: Simplify ADMIN queue access, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 17/25] block/nvme: Set request_alignment at initialization, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 16/25] block/nvme: Simplify nvme_cmd_sync(), Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 18/25] block/nvme: Correct minimum device page size, Philippe Mathieu-Daudé, 2020/10/29