diff options
| author | Philippe Mathieu-Daudé | 2020-08-21 21:53:50 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2020-09-07 12:23:55 +0200 |
| commit | c8edbfb2cc44ad78a8cfbdd6a0cd1af863e199fd (patch) | |
| tree | c79d20257118a0e4367459d253ff89634b4ffbab | |
| parent | block/nvme: Improve error message when IO queue creation failed (diff) | |
| download | qemu-c8edbfb2cc44ad78a8cfbdd6a0cd1af863e199fd.tar.gz qemu-c8edbfb2cc44ad78a8cfbdd6a0cd1af863e199fd.tar.xz qemu-c8edbfb2cc44ad78a8cfbdd6a0cd1af863e199fd.zip | |
block/nvme: Use common error path in nvme_add_io_queue()
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>
| -rw-r--r-- | block/nvme.c | 9 |
1 files 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) |