[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 16/17] hw/ide: drop iov field from IDEBufferedReq
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v4 16/17] hw/ide: drop iov field from IDEBufferedRequest |
Date: |
Mon, 18 Feb 2019 17:09:25 +0300 |
@iov is used only to initialize @qiov. Let's use new
qemu_iovec_init_buf() instead, which simplifies the code.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
include/hw/ide/internal.h | 1 -
hw/ide/core.c | 11 ++++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h
index fa99486d7a..1b02bb9151 100644
--- a/include/hw/ide/internal.h
+++ b/include/hw/ide/internal.h
@@ -346,7 +346,6 @@ extern const char *IDE_DMA_CMD_lookup[IDE_DMA__COUNT];
typedef struct IDEBufferedRequest {
QLIST_ENTRY(IDEBufferedRequest) list;
- struct iovec iov;
QEMUIOVector qiov;
QEMUIOVector *original_qiov;
BlockCompletionFunc *original_cb;
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 13f8f78ca6..6afadf894f 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -629,13 +629,15 @@ static void ide_buffered_readv_cb(void *opaque, int ret)
IDEBufferedRequest *req = opaque;
if (!req->orphaned) {
if (!ret) {
- qemu_iovec_from_buf(req->original_qiov, 0, req->iov.iov_base,
+ assert(req->qiov.size == req->original_qiov->size);
+ qemu_iovec_from_buf(req->original_qiov, 0,
+ req->qiov.local_iov.iov_base,
req->original_qiov->size);
}
req->original_cb(req->original_opaque, ret);
}
QLIST_REMOVE(req, list);
- qemu_vfree(req->iov.iov_base);
+ qemu_vfree(qemu_iovec_buf(&req->qiov));
g_free(req);
}
@@ -660,9 +662,8 @@ BlockAIOCB *ide_buffered_readv(IDEState *s, int64_t
sector_num,
req->original_qiov = iov;
req->original_cb = cb;
req->original_opaque = opaque;
- req->iov.iov_base = qemu_blockalign(blk_bs(s->blk), iov->size);
- req->iov.iov_len = iov->size;
- qemu_iovec_init_external(&req->qiov, &req->iov, 1);
+ qemu_iovec_init_buf(&req->qiov, blk_blockalign(s->blk, iov->size),
+ iov->size);
aioreq = blk_aio_preadv(s->blk, sector_num << BDRV_SECTOR_BITS,
&req->qiov, 0, ide_buffered_readv_cb, req);
--
2.18.0
- [Qemu-block] [PATCH v4 00/17] block: local qiov helper, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 16/17] hw/ide: drop iov field from IDEBufferedRequest,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH v4 17/17] hw/ide: drop iov field from IDEDMA, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 02/17] block/io: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 12/17] qemu-img: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 01/17] block: enhance QEMUIOVector structure, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 08/17] block/qcow: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 09/17] block/qcow2: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 15/17] hw/ide: drop iov field from IDEState, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 07/17] block/parallels: use QEMU_IOVEC_INIT_BUF, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 04/17] block/backup: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18