From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgcHu-0005lK-OG for qemu-devel@nongnu.org; Wed, 13 Nov 2013 10:23:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VgcHo-0005rq-PR for qemu-devel@nongnu.org; Wed, 13 Nov 2013 10:23:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1976) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgcHo-0005r5-Gu for qemu-devel@nongnu.org; Wed, 13 Nov 2013 10:23:20 -0500 Date: Wed, 13 Nov 2013 10:23:15 -0500 From: Jeff Cody Message-ID: <20131113152314.GA22807@localhost.localdomain> References: <1384303994-26796-1-git-send-email-famz@redhat.com> <1384303994-26796-2-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1384303994-26796-2-git-send-email-famz@redhat.com> Subject: Re: [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: Fam Zheng Cc: kwolf@redhat.com, gentoo.integer@gmail.com, qemu-devel@nongnu.org, stefanha@redhat.com On Wed, Nov 13, 2013 at 08:53:10AM +0800, Fam Zheng wrote: > 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; You need to move the error checking up as well, above the 'if (compress)' Jeff