[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/33] block/nvme: Make nvme_identify() return boolean indicating
From: |
Stefan Hajnoczi |
Subject: |
[PULL 12/33] block/nvme: Make nvme_identify() return boolean indicating error |
Date: |
Wed, 4 Nov 2020 15:18:07 +0000 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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.
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20201029093306.1063879-11-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
---
block/nvme.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index c450499111..9833501245 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -506,9 +506,11 @@ static int nvme_cmd_sync(BlockDriverState *bs,
NVMeQueuePair *q,
return ret;
}
-static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp)
+/* Returns true on success, false on failure. */
+static bool nvme_identify(BlockDriverState *bs, int namespace, Error **errp)
{
BDRVNVMeState *s = bs->opaque;
+ bool ret = false;
union {
NvmeIdCtrl ctrl;
NvmeIdNs ns;
@@ -585,10 +587,13 @@ static void nvme_identify(BlockDriverState *bs, int
namespace, Error **errp)
goto out;
}
+ ret = true;
s->blkshift = lbaf->ds;
out:
qemu_vfio_dma_unmap(s->vfio, id);
qemu_vfree(id);
+
+ return ret;
}
static bool nvme_poll_queue(NVMeQueuePair *q)
@@ -701,7 +706,6 @@ static int nvme_init(BlockDriverState *bs, const char
*device, int namespace,
uint64_t cap;
uint64_t timeout_ms;
uint64_t deadline, now;
- Error *local_err = NULL;
volatile NvmeBar *regs = NULL;
qemu_co_mutex_init(&s->dma_map_lock);
@@ -818,9 +822,7 @@ static int nvme_init(BlockDriverState *bs, const char
*device, int namespace,
&s->irq_notifier[MSIX_SHARED_IRQ_IDX],
false, nvme_handle_event, nvme_poll_cb);
- nvme_identify(bs, namespace, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
+ if (!nvme_identify(bs, namespace, errp)) {
ret = -EIO;
goto out;
}
--
2.28.0
- [PULL 02/33] softmmu/memory: fix memory_region_ioeventfd_equal(), (continued)
- [PULL 02/33] softmmu/memory: fix memory_region_ioeventfd_equal(), Stefan Hajnoczi, 2020/11/04
- [PULL 03/33] MAINTAINERS: Cover "block/nvme.h" file, Stefan Hajnoczi, 2020/11/04
- [PULL 04/33] block/nvme: Use hex format to display offset in trace events, Stefan Hajnoczi, 2020/11/04
- [PULL 05/33] block/nvme: Report warning with warn_report(), Stefan Hajnoczi, 2020/11/04
- [PULL 06/33] block/nvme: Trace controller capabilities, Stefan Hajnoczi, 2020/11/04
- [PULL 07/33] block/nvme: Trace nvme_poll_queue() per queue, Stefan Hajnoczi, 2020/11/04
- [PULL 08/33] block/nvme: Improve nvme_free_req_queue_wait() trace information, Stefan Hajnoczi, 2020/11/04
- [PULL 09/33] block/nvme: Trace queue pair creation/deletion, Stefan Hajnoczi, 2020/11/04
- [PULL 10/33] block/nvme: Move definitions before structure declarations, Stefan Hajnoczi, 2020/11/04
- [PULL 11/33] block/nvme: Use unsigned integer for queue counter/size, Stefan Hajnoczi, 2020/11/04
- [PULL 12/33] block/nvme: Make nvme_identify() return boolean indicating error,
Stefan Hajnoczi <=
- [PULL 13/33] block/nvme: Make nvme_init_queue() return boolean indicating error, Stefan Hajnoczi, 2020/11/04
- [PULL 14/33] block/nvme: Introduce Completion Queue definitions, Stefan Hajnoczi, 2020/11/04
- [PULL 15/33] block/nvme: Use definitions instead of magic values in add_io_queue(), Stefan Hajnoczi, 2020/11/04
- [PULL 16/33] block/nvme: Correctly initialize Admin Queue Attributes, Stefan Hajnoczi, 2020/11/04
- [PULL 17/33] block/nvme: Simplify ADMIN queue access, Stefan Hajnoczi, 2020/11/04
- [PULL 18/33] block/nvme: Simplify nvme_cmd_sync(), Stefan Hajnoczi, 2020/11/04
- [PULL 19/33] block/nvme: Set request_alignment at initialization, Stefan Hajnoczi, 2020/11/04
- [PULL 20/33] block/nvme: Correct minimum device page size, Stefan Hajnoczi, 2020/11/04
- [PULL 22/33] block/nvme: Change size and alignment of queue, Stefan Hajnoczi, 2020/11/04
- [PULL 21/33] block/nvme: Change size and alignment of IDENTIFY response buffer, Stefan Hajnoczi, 2020/11/04