[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 01/12] hw/block/nvme: remove redundant len member in compare c
From: |
Klaus Jensen |
Subject: |
[PATCH v4 01/12] hw/block/nvme: remove redundant len member in compare context |
Date: |
Mon, 1 Mar 2021 15:00:36 +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>
Reviewed-by: Keith Busch <kbusch@kernel.org>
---
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 edd0b85c10ce..baa69a4a6859 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1697,7 +1697,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)
@@ -1718,16 +1717,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;
}
@@ -1964,7 +1963,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.1
- [PATCH v4 00/12] hw/block/nvme: metadata and end-to-end data protection support, Klaus Jensen, 2021/03/01
- [PATCH v4 02/12] hw/block/nvme: remove block accounting for write zeroes, Klaus Jensen, 2021/03/01
- [PATCH v4 04/12] hw/block/nvme: try to deal with the iov/qsg duality, Klaus Jensen, 2021/03/01
- [PATCH v4 01/12] hw/block/nvme: remove redundant len member in compare context,
Klaus Jensen <=
- [PATCH v4 03/12] hw/block/nvme: fix strerror printing, Klaus Jensen, 2021/03/01
- [PATCH v4 06/12] hw/block/nvme: refactor nvme_dma, Klaus Jensen, 2021/03/01
- [PATCH v4 05/12] hw/block/nvme: remove the req dependency in map functions, Klaus Jensen, 2021/03/01
- [PATCH v4 07/12] hw/block/nvme: add metadata support, Klaus Jensen, 2021/03/01
- [PATCH v4 12/12] hw/block/nvme: add support for the format nvm command, Klaus Jensen, 2021/03/01
- [PATCH v4 09/12] hw/block/nvme: add verify command, Klaus Jensen, 2021/03/01
- [PATCH v4 08/12] hw/block/nvme: end-to-end data protection, Klaus Jensen, 2021/03/01
- [PATCH v4 11/12] hw/block/nvme: support multiple lba formats, Klaus Jensen, 2021/03/01
- [PATCH v4 10/12] hw/block/nvme: add non-mdts command size limit for verify, Klaus Jensen, 2021/03/01
- Re: [PATCH v4 00/12] hw/block/nvme: metadata and end-to-end data protection support, Keith Busch, 2021/03/01