[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 10/16] block/nvme: Replace qemu_try_blockalign(bs) by qemu_try
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 10/16] block/nvme: Replace qemu_try_blockalign(bs) by qemu_try_memalign(pg_sz) |
Date: |
Sat, 4 Jul 2020 23:30:45 +0200 |
qemu_try_blockalign() is a generic API that call back to the
block driver to return its page alignment. As we call from
within the very same driver, we already know to page alignment
stored in our state. Remove indirections and use the value from
BDRVNVMeState.
This change is required to later remove the BlockDriverState
argument, to make nvme_init_queue() per hardware, and not per
block driver.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index 9c118c000d..9566001ba6 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -174,7 +174,7 @@ static void nvme_init_queue(BlockDriverState *bs, NVMeQueue
*q,
bytes = ROUND_UP(nentries * entry_bytes, s->page_size);
q->head = q->tail = 0;
- q->queue = qemu_try_blockalign(bs, bytes);
+ q->queue = qemu_try_memalign(s->page_size, bytes);
if (!q->queue) {
error_setg(errp, "Cannot allocate queue");
return;
@@ -223,7 +223,7 @@ static NVMeQueuePair
*nvme_create_queue_pair(BlockDriverState *bs,
if (!q) {
return NULL;
}
- q->prp_list_pages = qemu_try_blockalign(bs,
+ q->prp_list_pages = qemu_try_memalign(s->page_size,
s->page_size * NVME_QUEUE_SIZE);
if (!q->prp_list_pages) {
goto fail;
@@ -522,7 +522,7 @@ static void nvme_identify(BlockDriverState *bs, int
namespace, Error **errp)
.cdw10 = cpu_to_le32(0x1),
};
- id = qemu_try_blockalign(bs, sizeof(*id));
+ id = qemu_try_memalign(s->page_size, sizeof(*id));
if (!id) {
error_setg(errp, "Cannot allocate buffer for identify response");
goto out;
@@ -1141,7 +1141,7 @@ static int nvme_co_prw(BlockDriverState *bs, uint64_t
offset, uint64_t bytes,
return nvme_co_prw_aligned(bs, offset, bytes, qiov, is_write, flags);
}
trace_nvme_prw_buffered(s, offset, bytes, qiov->niov, is_write);
- buf = qemu_try_blockalign(bs, bytes);
+ buf = qemu_try_memalign(s->page_size, bytes);
if (!buf) {
return -ENOMEM;
@@ -1285,7 +1285,7 @@ static int coroutine_fn nvme_co_pdiscard(BlockDriverState
*bs,
assert(s->nr_queues > 1);
- buf = qemu_try_blockalign(bs, s->page_size);
+ buf = qemu_try_memalign(s->page_size, s->page_size);
if (!buf) {
return -ENOMEM;
}
--
2.21.3
- [PATCH v3 02/16] block/nvme: Avoid further processing if trace event not enabled, (continued)
- [PATCH v3 02/16] block/nvme: Avoid further processing if trace event not enabled, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 03/16] block/nvme: Let nvme_create_queue_pair() fail gracefully, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 04/16] block/nvme: Define QUEUE_INDEX macros to ease code review, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 05/16] block/nvme: Improve error message when IO queue creation failed, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 06/16] block/nvme: Use common error path in nvme_add_io_queue(), Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 07/16] block/nvme: Rename local variable, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 08/16] block/nvme: Use union of NvmeIdCtrl / NvmeIdNs structures, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 09/16] block/nvme: Replace qemu_try_blockalign0 by qemu_try_blockalign/memset, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 10/16] block/nvme: Replace qemu_try_blockalign(bs) by qemu_try_memalign(pg_sz),
Philippe Mathieu-Daudé <=
- [PATCH v3 11/16] block/nvme: Simplify nvme_init_queue() arguments, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 12/16] block/nvme: Replace BDRV_POLL_WHILE by AIO_WAIT_WHILE, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 13/16] block/nvme: Simplify nvme_create_queue_pair() arguments, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 14/16] block/nvme: Extract nvme_poll_queue(), Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 15/16] block/nvme: Move nvme_poll_cb() earlier, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 16/16] block/nvme: Use per-queuepair IRQ notifier and AIO context, Philippe Mathieu-Daudé, 2020/07/04