[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/15] block/nvme: Pass AioContext argument to nvme_add_io_queue(
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 08/15] block/nvme: Pass AioContext argument to nvme_add_io_queue() |
Date: |
Wed, 14 Oct 2020 17:58:03 +0200 |
We want to get ride of the BlockDriverState pointer at some point,
so pass aio_context along.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index 523814a1243..b841c5950c5 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -642,7 +642,9 @@ static bool nvme_poll_cb(void *opaque)
return nvme_poll_queues(s);
}
-static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp)
+/* Returns true on success, false on failure. */
+static bool nvme_add_io_queue(BlockDriverState *bs,
+ AioContext *aio_context, Error **errp)
{
BDRVNVMeState *s = bs->opaque;
unsigned n = s->nr_queues;
@@ -650,8 +652,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error
**errp)
NvmeCmd cmd;
unsigned queue_size = NVME_QUEUE_SIZE;
- q = nvme_create_queue_pair(s, bdrv_get_aio_context(bs),
- n, queue_size, errp);
+ q = nvme_create_queue_pair(s, aio_context, n, queue_size, errp);
if (!q) {
return false;
}
@@ -805,7 +806,7 @@ static int nvme_init(BlockDriverState *bs, const char
*device, int namespace,
}
/* Set up command queues. */
- if (!nvme_add_io_queue(bs, errp)) {
+ if (!nvme_add_io_queue(bs, aio_context, errp)) {
ret = -EIO;
}
out:
--
2.26.2
- [PATCH 02/15] block/nvme: Trace nvme_poll_queue() per queue, (continued)
- [PATCH 02/15] block/nvme: Trace nvme_poll_queue() per queue, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 01/15] block/nvme: Move nvme_poll_cb() earlier, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 03/15] block/nvme: Use unsigned integer for queue counter/size, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 04/15] block/nvme: Improve nvme_free_req_queue_wait() trace information, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 05/15] block/nvme: Trace queue pair creation/deletion, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 06/15] block/nvme: Make nvme_identify() return boolean indicating error, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 07/15] block/nvme: Make nvme_init_queue() return boolean indicating error, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 09/15] block/nvme: Introduce Completion Queue definitions, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 10/15] block/nvme: Use definitions instead of magic values in add_io_queue(), Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 08/15] block/nvme: Pass AioContext argument to nvme_add_io_queue(),
Philippe Mathieu-Daudé <=
- [PATCH 12/15] block/nvme: Simplify device reset, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 11/15] block/nvme: Trace controller capabilities, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 13/15] block/nvme: Simplify ADMIN queue access, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 15/15] block/nvme: Set request_alignment at initialization, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 14/15] block/nvme: Report warning with warn_report(), Philippe Mathieu-Daudé, 2020/10/14