[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 08/17] block/qcow: use qemu_iovec_init_buf
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v4 08/17] block/qcow: use qemu_iovec_init_buf |
Date: |
Mon, 18 Feb 2019 17:09:17 +0300 |
Use new qemu_iovec_init_buf() instead of
qemu_iovec_init_external( ... , 1), which simplifies the code.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
block/qcow.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/block/qcow.c b/block/qcow.c
index 0a235bf393..409c700d33 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -628,7 +628,6 @@ static coroutine_fn int qcow_co_preadv(BlockDriverState
*bs, uint64_t offset,
int offset_in_cluster;
int ret = 0, n;
uint64_t cluster_offset;
- struct iovec hd_iov;
QEMUIOVector hd_qiov;
uint8_t *buf;
void *orig_buf;
@@ -661,9 +660,7 @@ static coroutine_fn int qcow_co_preadv(BlockDriverState
*bs, uint64_t offset,
if (!cluster_offset) {
if (bs->backing) {
/* read from the base image */
- hd_iov.iov_base = (void *)buf;
- hd_iov.iov_len = n;
- qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
+ qemu_iovec_init_buf(&hd_qiov, buf, n);
qemu_co_mutex_unlock(&s->lock);
/* qcow2 emits this on bs->file instead of bs->backing */
BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
@@ -688,9 +685,7 @@ static coroutine_fn int qcow_co_preadv(BlockDriverState
*bs, uint64_t offset,
ret = -EIO;
break;
}
- hd_iov.iov_base = (void *)buf;
- hd_iov.iov_len = n;
- qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
+ qemu_iovec_init_buf(&hd_qiov, buf, n);
qemu_co_mutex_unlock(&s->lock);
BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
ret = bdrv_co_preadv(bs->file, cluster_offset + offset_in_cluster,
@@ -733,7 +728,6 @@ static coroutine_fn int qcow_co_pwritev(BlockDriverState
*bs, uint64_t offset,
int offset_in_cluster;
uint64_t cluster_offset;
int ret = 0, n;
- struct iovec hd_iov;
QEMUIOVector hd_qiov;
uint8_t *buf;
void *orig_buf;
@@ -779,9 +773,7 @@ static coroutine_fn int qcow_co_pwritev(BlockDriverState
*bs, uint64_t offset,
}
}
- hd_iov.iov_base = (void *)buf;
- hd_iov.iov_len = n;
- qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
+ qemu_iovec_init_buf(&hd_qiov, buf, n);
qemu_co_mutex_unlock(&s->lock);
BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
ret = bdrv_co_pwritev(bs->file, cluster_offset + offset_in_cluster,
@@ -1062,7 +1054,6 @@ qcow_co_pwritev_compressed(BlockDriverState *bs, uint64_t
offset,
{
BDRVQcowState *s = bs->opaque;
QEMUIOVector hd_qiov;
- struct iovec iov;
z_stream strm;
int ret, out_len;
uint8_t *buf, *out_buf;
@@ -1128,11 +1119,7 @@ qcow_co_pwritev_compressed(BlockDriverState *bs,
uint64_t offset,
}
cluster_offset &= s->cluster_offset_mask;
- iov = (struct iovec) {
- .iov_base = out_buf,
- .iov_len = out_len,
- };
- qemu_iovec_init_external(&hd_qiov, &iov, 1);
+ qemu_iovec_init_buf(&hd_qiov, out_buf, out_len);
BLKDBG_EVENT(bs->file, BLKDBG_WRITE_COMPRESSED);
ret = bdrv_co_pwritev(bs->file, cluster_offset, out_len, &hd_qiov, 0);
if (ret < 0) {
--
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, 2019/02/18
- [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 <=
- [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
- [Qemu-block] [PATCH v4 03/17] block/block-backend: use QEMU_IOVEC_INIT_BUF, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 05/17] block/commit: use QEMU_IOVEC_INIT_BUF, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 10/17] block/qed: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 06/17] block/stream: use QEMU_IOVEC_INIT_BUF, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 13/17] migration/block: use qemu_iovec_init_buf, Vladimir Sementsov-Ogievskiy, 2019/02/18
- [Qemu-block] [PATCH v4 14/17] tests/test-bdrv-drain: use QEMU_IOVEC_INIT_BUF, Vladimir Sementsov-Ogievskiy, 2019/02/18