[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 05/16] qcow2: cleanup qcow2_co_pwritev_compressed
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH v7 05/16] qcow2: cleanup qcow2_co_pwritev_compressed to avoid the recursion |
Date: |
Fri, 22 Jul 2016 11:17:44 +0300 |
From: Pavel Butsykin <address@hidden>
Now that the function uses a vector instead of a buffer, there is no
need to use recursive code.
Signed-off-by: Pavel Butsykin <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Jeff Cody <address@hidden>
CC: Markus Armbruster <address@hidden>
CC: Eric Blake <address@hidden>
CC: John Snow <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: Kevin Wolf <address@hidden>
---
block/qcow2.c | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index b5c69df..01bc003 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2554,27 +2554,17 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs,
uint64_t offset,
return bdrv_truncate(bs->file->bs, cluster_offset);
}
+ buf = qemu_blockalign(bs, s->cluster_size);
if (bytes != s->cluster_size) {
- ret = -EINVAL;
-
- /* Zero-pad last write if image size is not cluster aligned */
- if (offset + bytes == bs->total_sectors << BDRV_SECTOR_BITS &&
- bytes < s->cluster_size)
+ if (bytes > s->cluster_size ||
+ offset + bytes != bs->total_sectors << BDRV_SECTOR_BITS)
{
- uint8_t *pad_buf = qemu_blockalign(bs, s->cluster_size);
- memset(pad_buf, 0, s->cluster_size);
- qemu_iovec_to_buf(qiov, 0, pad_buf, s->cluster_size);
- iov = (struct iovec) {
- .iov_base = pad_buf,
- .iov_len = s->cluster_size,
- };
- qemu_iovec_init_external(&hd_qiov, &iov, 1);
- ret = qcow2_co_pwritev_compressed(bs, offset, bytes, &hd_qiov);
- qemu_vfree(pad_buf);
+ qemu_vfree(buf);
+ return -EINVAL;
}
- return ret;
+ /* Zero-pad last write if image size is not cluster aligned */
+ memset(buf + bytes, 0, s->cluster_size - bytes);
}
- buf = qemu_blockalign(bs, s->cluster_size);
qemu_iovec_to_buf(qiov, 0, buf, s->cluster_size);
out_buf = g_malloc(s->cluster_size + (s->cluster_size / 1000) + 128);
--
2.1.4
- [Qemu-devel] [PATCH v7 00/16] backup compression, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 14/16] blockdev-backup: added support for data compression, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 09/16] block: remove BlockDriver.bdrv_write_compressed, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 03/16] block/io: reuse bdrv_co_pwritev() for write compressed, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 08/16] qcow: cleanup qcow_co_pwritev_compressed to avoid the recursion, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 07/16] qcow: add qcow_co_pwritev_compressed, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 01/16] block: switch blk_write_compressed() to byte-based interface, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 11/16] block: simplify drive-backup, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 13/16] drive-backup: added support for data compression, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 10/16] block/io: turn on dirty_bitmaps for the compressed writes, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 05/16] qcow2: cleanup qcow2_co_pwritev_compressed to avoid the recursion,
Denis V. Lunev <=
- [Qemu-devel] [PATCH v7 04/16] qcow2: add qcow2_co_pwritev_compressed, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 16/16] qemu-iotests: add vmdk for test backup compression in 055, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 02/16] block: Convert bdrv_pwrite_compressed() to BdrvChild, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 15/16] qemu-iotests: test backup compression in 055, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 12/16] block: simplify blockdev-backup, Denis V. Lunev, 2016/07/22
- [Qemu-devel] [PATCH v7 06/16] vmdk: add vmdk_co_pwritev_compressed, Denis V. Lunev, 2016/07/22