[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/64] block/nvme: Use common error path in nvme_add_io_queue()
From: |
Kevin Wolf |
Subject: |
[PULL 07/64] block/nvme: Use common error path in nvme_add_io_queue() |
Date: |
Mon, 7 Sep 2020 13:08:39 +0200 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Rearrange nvme_add_io_queue() by using a common error path.
This will be proven useful in few commits where we add IRQ
notification to the IO queues.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200821195359.1285345-7-philmd@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/nvme.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index 91dba4ec5d..909a565184 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -649,8 +649,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error
**errp)
};
if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) {
error_setg(errp, "Failed to create CQ io queue [%d]", n);
- nvme_free_queue_pair(q);
- return false;
+ goto out_error;
}
cmd = (NvmeCmd) {
.opcode = NVME_ADM_CMD_CREATE_SQ,
@@ -660,13 +659,15 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error
**errp)
};
if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) {
error_setg(errp, "Failed to create SQ io queue [%d]", n);
- nvme_free_queue_pair(q);
- return false;
+ goto out_error;
}
s->queues = g_renew(NVMeQueuePair *, s->queues, n + 1);
s->queues[n] = q;
s->nr_queues++;
return true;
+out_error:
+ nvme_free_queue_pair(q);
+ return false;
}
static bool nvme_poll_cb(void *opaque)
--
2.25.4
- [PULL 00/64] Block layer patches, Kevin Wolf, 2020/09/07
- [PULL 02/64] block/nvme: Replace magic value by SCALE_MS definition, Kevin Wolf, 2020/09/07
- [PULL 04/64] block/nvme: Let nvme_create_queue_pair() fail gracefully, Kevin Wolf, 2020/09/07
- [PULL 03/64] block/nvme: Avoid further processing if trace event not enabled, Kevin Wolf, 2020/09/07
- [PULL 01/64] block: Raise an error when backing file parameter is an empty string, Kevin Wolf, 2020/09/07
- [PULL 06/64] block/nvme: Improve error message when IO queue creation failed, Kevin Wolf, 2020/09/07
- [PULL 07/64] block/nvme: Use common error path in nvme_add_io_queue(),
Kevin Wolf <=
- [PULL 05/64] block/nvme: Define INDEX macros to ease code review, Kevin Wolf, 2020/09/07
- [PULL 09/64] block/nvme: Use union of NvmeIdCtrl / NvmeIdNs structures, Kevin Wolf, 2020/09/07
- [PULL 10/64] block/nvme: Replace qemu_try_blockalign0 by qemu_try_blockalign/memset, Kevin Wolf, 2020/09/07
- [PULL 11/64] block/nvme: Replace qemu_try_blockalign(bs) by qemu_try_memalign(pg_sz), Kevin Wolf, 2020/09/07
- [PULL 12/64] block/nvme: Simplify nvme_init_queue() arguments, Kevin Wolf, 2020/09/07
- [PULL 13/64] block/nvme: Replace BDRV_POLL_WHILE by AIO_WAIT_WHILE, Kevin Wolf, 2020/09/07
- [PULL 08/64] block/nvme: Rename local variable, Kevin Wolf, 2020/09/07
- [PULL 14/64] block/nvme: Simplify nvme_create_queue_pair() arguments, Kevin Wolf, 2020/09/07
- [PULL 15/64] block/nvme: Extract nvme_poll_queue(), Kevin Wolf, 2020/09/07
- [PULL 17/64] block: Add child access functions, Kevin Wolf, 2020/09/07