[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/12] block/nvme: Simplify nvme_init_queue() arguments
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 09/12] block/nvme: Simplify nvme_init_queue() arguments |
Date: |
Tue, 30 Jun 2020 21:13:15 +0200 |
nvme_init_queue() doesn't require BlockDriverState anymore.
Replace it by BDRVNVMeState to simplify.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index 8b4d957a8e..c28c08b3e3 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -165,10 +165,9 @@ static QemuOptsList runtime_opts = {
},
};
-static void nvme_init_queue(BlockDriverState *bs, NVMeQueue *q,
+static void nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q,
int nentries, int entry_bytes, Error **errp)
{
- BDRVNVMeState *s = bs->opaque;
size_t bytes;
int r;
@@ -251,14 +250,14 @@ static NVMeQueuePair
*nvme_create_queue_pair(BlockDriverState *bs,
req->prp_list_iova = prp_list_iova + i * s->page_size;
}
- nvme_init_queue(bs, &q->sq, size, NVME_SQ_ENTRY_BYTES, &local_err);
+ nvme_init_queue(s, &q->sq, size, NVME_SQ_ENTRY_BYTES, &local_err);
if (local_err) {
error_propagate(errp, local_err);
goto fail;
}
q->sq.doorbell = &s->regs->doorbells[idx * 2 * s->doorbell_scale];
- nvme_init_queue(bs, &q->cq, size, NVME_CQ_ENTRY_BYTES, &local_err);
+ nvme_init_queue(s, &q->cq, size, NVME_CQ_ENTRY_BYTES, &local_err);
if (local_err) {
error_propagate(errp, local_err);
goto fail;
--
2.21.3
- [PATCH v2 00/12] block/nvme: Various cleanups required to use multiple queues, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 01/12] block/nvme: Replace magic value by SCALE_MS definition, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 02/12] block/nvme: Avoid further processing if trace event not enabled, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 03/12] block/nvme: Let nvme_create_queue_pair() fail gracefully, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 04/12] block/nvme: Define QUEUE_INDEX macros to ease code review, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 05/12] block/nvme: Rename local variable, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 08/12] block/nvme: Replace qemu_try_blockalign(bs) by qemu_try_memalign(pg_sz), Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 09/12] block/nvme: Simplify nvme_init_queue() arguments,
Philippe Mathieu-Daudé <=
- [PATCH v2 06/12] block/nvme: Use union of NvmeIdCtrl / NvmeIdNs structures, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 10/12] block/nvme: Replace BDRV_POLL_WHILE by AIO_WAIT_WHILE, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 11/12] block/nvme: Simplify nvme_create_queue_pair() arguments, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 12/12] block/nvme: Use per-queue AIO context, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 07/12] block/nvme: Replace qemu_try_blockalign0 by qemu_try_blockalign/memset, Philippe Mathieu-Daudé, 2020/06/30