[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC v3 01/12] hw/block/nvme: remove redundant len member in compa
From: |
Klaus Jensen |
Subject: |
[PATCH RFC v3 01/12] hw/block/nvme: remove redundant len member in compare context |
Date: |
Mon, 15 Feb 2021 00:02:29 +0100 |
From: Klaus Jensen <k.jensen@samsung.com>
The 'len' member of the nvme_compare_ctx struct is redundant since the
same information is available in the 'iov' member.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
---
hw/block/nvme.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 1cd82fa3c9fe..9e1351ce7edd 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1692,7 +1692,6 @@ static void nvme_aio_copy_in_cb(void *opaque, int ret)
struct nvme_compare_ctx {
QEMUIOVector iov;
uint8_t *bounce;
- size_t len;
};
static void nvme_compare_cb(void *opaque, int ret)
@@ -1713,16 +1712,16 @@ static void nvme_compare_cb(void *opaque, int ret)
goto out;
}
- buf = g_malloc(ctx->len);
+ buf = g_malloc(ctx->iov.size);
- status = nvme_dma(nvme_ctrl(req), buf, ctx->len, DMA_DIRECTION_TO_DEVICE,
- req);
+ status = nvme_dma(nvme_ctrl(req), buf, ctx->iov.size,
+ DMA_DIRECTION_TO_DEVICE, req);
if (status) {
req->status = status;
goto out;
}
- if (memcmp(buf, ctx->bounce, ctx->len)) {
+ if (memcmp(buf, ctx->bounce, ctx->iov.size)) {
req->status = NVME_CMP_FAILURE;
}
@@ -1960,7 +1959,6 @@ static uint16_t nvme_compare(NvmeCtrl *n, NvmeRequest
*req)
ctx = g_new(struct nvme_compare_ctx, 1);
ctx->bounce = bounce;
- ctx->len = len;
req->opaque = ctx;
--
2.30.0
- [PATCH RFC v3 00/12] hw/block/nvme: metadata and end-to-end data protection support, Klaus Jensen, 2021/02/14
- [PATCH RFC v3 02/12] hw/block/nvme: remove block accounting for write zeroes, Klaus Jensen, 2021/02/14
- [PATCH RFC v3 03/12] hw/block/nvme: fix strerror printing, Klaus Jensen, 2021/02/14
- [PATCH RFC v3 01/12] hw/block/nvme: remove redundant len member in compare context,
Klaus Jensen <=
- [PATCH RFC v3 05/12] hw/block/nvme: remove the req dependency in map functions, Klaus Jensen, 2021/02/14
- [PATCH RFC v3 08/12] hw/block/nvme: end-to-end data protection, Klaus Jensen, 2021/02/14
- [PATCH RFC v3 06/12] hw/block/nvme: refactor nvme_dma, Klaus Jensen, 2021/02/14
- [PATCH RFC v3 10/12] hw/block/nvme: add non-mdts command size limit for verify, Klaus Jensen, 2021/02/14
- [PATCH RFC v3 07/12] hw/block/nvme: add metadata support, Klaus Jensen, 2021/02/14
- [PATCH RFC v3 09/12] hw/block/nvme: add verify command, Klaus Jensen, 2021/02/14