From: Pavel Butsykin <pbutsy...@virtuozzo.com>
Now that the function uses a vector instead of a buffer, there is no
need to use recursive code.
Signed-off-by: Pavel Butsykin <pbutsy...@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
Signed-off-by: Denis V. Lunev <d...@openvz.org>
CC: Jeff Cody <jc...@redhat.com>
CC: Markus Armbruster <arm...@redhat.com>
CC: Eric Blake <ebl...@redhat.com>
CC: John Snow <js...@redhat.com>
CC: Stefan Hajnoczi <stefa...@redhat.com>
CC: Kevin Wolf <kw...@redhat.com>
---
block/qcow.c | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/block/qcow.c b/block/qcow.c
index e1d335d..20d2e15 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -927,27 +927,17 @@ qcow_co_pwritev_compressed(BlockDriverState *bs, uint64_t
offset,
uint8_t *buf, *out_buf;
uint64_t 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 = qcow_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, qiov->size);
out_buf = g_malloc(s->cluster_size + (s->cluster_size / 1000) + 128);
--
2.5.0
