From patchwork Fri Apr 30 14:00:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 51332 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 72C1AB7D17 for ; Sat, 1 May 2010 00:09:46 +1000 (EST) Received: from localhost ([127.0.0.1]:35684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7quV-0001PZ-3R for incoming@patchwork.ozlabs.org; Fri, 30 Apr 2010 10:09:43 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O7qn2-0007DR-Hp for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:02:00 -0400 Received: from [140.186.70.92] (port=55099 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7qn0-0007BK-5X for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:02:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O7qmy-0000No-FK for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:01:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12031) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O7qmy-0000Ne-3p for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:01:56 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3UE1ofi009966 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 30 Apr 2010 10:01:50 -0400 Received: from localhost.localdomain (vpn1-6-55.ams2.redhat.com [10.36.6.55]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3UE14s4007196; Fri, 30 Apr 2010 10:01:48 -0400 From: Kevin Wolf To: aliguori@linux.vnet.ibm.com Date: Fri, 30 Apr 2010 16:00:27 +0200 Message-Id: <1272636040-17374-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1272636040-17374-1-git-send-email-kwolf@redhat.com> References: <1272636040-17374-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 05/18] block: bdrv_has_zero_init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This fixes the problem that qemu-img's use of no_zero_init only considered the no_zero_init flag of the format driver, but not of the underlying protocols. Between the raw/file split and this fix, converting to host devices is broken. Signed-off-by: Kevin Wolf --- block.c | 13 +++++++++++++ block.h | 1 + qemu-img.c | 6 ++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index eb1d562..56835af 100644 --- a/block.c +++ b/block.c @@ -1282,6 +1282,19 @@ void bdrv_flush_all(void) } } +int bdrv_has_zero_init(BlockDriverState *bs) +{ + assert(bs->drv); + + if (bs->drv->no_zero_init) { + return 0; + } else if (bs->file) { + return bdrv_has_zero_init(bs->file); + } + + return 1; +} + /* * Returns true iff the specified sector is present in the disk image. Drivers * not implementing the functionality are assumed to not support backing files, diff --git a/block.h b/block.h index f58edf1..f87d24e 100644 --- a/block.h +++ b/block.h @@ -122,6 +122,7 @@ BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *bs, void bdrv_flush(BlockDriverState *bs); void bdrv_flush_all(void); +int bdrv_has_zero_init(BlockDriverState *bs); int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum); diff --git a/qemu-img.c b/qemu-img.c index 7203b8b..74311a5 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -732,6 +732,8 @@ static int img_convert(int argc, char **argv) /* signal EOF to align */ bdrv_write_compressed(out_bs, 0, NULL, 0); } else { + int has_zero_init = bdrv_has_zero_init(out_bs); + sector_num = 0; // total number of sectors converted so far for(;;) { nb_sectors = total_sectors - sector_num; @@ -755,7 +757,7 @@ static int img_convert(int argc, char **argv) if (n > bs_offset + bs_sectors - sector_num) n = bs_offset + bs_sectors - sector_num; - if (!drv->no_zero_init) { + if (has_zero_init) { /* If the output image is being created as a copy on write image, assume that sectors which are unallocated in the input image are present in both the output's and input's base images (no @@ -788,7 +790,7 @@ static int img_convert(int argc, char **argv) If the output is to a host device, we also write out sectors that are entirely 0, since whatever data was already there is garbage, not 0s. */ - if (drv->no_zero_init || out_baseimg || + if (!has_zero_init || out_baseimg || is_allocated_sectors(buf1, n, &n1)) { if (bdrv_write(out_bs, sector_num, buf1, n1) < 0) error("error while writing");