From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgOhz-0001BW-2H for qemu-devel@nongnu.org; Tue, 12 Nov 2013 19:53:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VgOht-0005t7-1c for qemu-devel@nongnu.org; Tue, 12 Nov 2013 19:53:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgOhs-0005sO-Pb for qemu-devel@nongnu.org; Tue, 12 Nov 2013 19:53:20 -0500 From: Fam Zheng Date: Wed, 13 Nov 2013 08:53:10 +0800 Message-Id: <1384303994-26796-2-git-send-email-famz@redhat.com> In-Reply-To: <1384303994-26796-1-git-send-email-famz@redhat.com> References: <1384303994-26796-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 1/5] qemu-img: Convert by cluster size if target is compressed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, gentoo.integer@gmail.com, stefanha@redhat.com If target block driver forces compression, qemu-img convert needs to write by cluster size as well as "-c" option. Particularly, this applies for converting to VMDK streamOptimized format. Signed-off-by: Fam Zheng --- include/block/block.h | 1 + qemu-img.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/block/block.h b/include/block/block.h index 3560deb..169c092 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -18,6 +18,7 @@ typedef struct BlockDriverInfo { /* offset at which the VM state can be saved (0 if not possible) */ int64_t vm_state_offset; bool is_dirty; + bool is_compressed; } BlockDriverInfo; typedef struct BlockFragInfo { diff --git a/qemu-img.c b/qemu-img.c index bf3fb4f..09ed9b2 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1383,8 +1383,11 @@ static int img_convert(int argc, char **argv) } } + ret = bdrv_get_info(out_bs, &bdi); + if (ret == 0) { + compress = compress || bdi.is_compressed; + } if (compress) { - ret = bdrv_get_info(out_bs, &bdi); if (ret < 0) { error_report("could not get block driver info"); goto out; -- 1.8.4.2