From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvn4-00010R-5G for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:58:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VLvmx-0004PR-DA for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:58:06 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:35148 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvhb-0002Oz-Re for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:52:28 -0400 From: Peter Lieven Date: Tue, 17 Sep 2013 15:48:54 +0200 Message-Id: <1379425736-11326-19-git-send-email-pl@kamp.de> In-Reply-To: <1379425736-11326-1-git-send-email-pl@kamp.de> References: <1379425736-11326-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv2 18/20] qemu-img: add support for fully allocated images List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, ronniesahlberg@gmail.com, Peter Lieven , stefanha@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com Signed-off-by: Peter Lieven --- qemu-img.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 3e5e388..7600b58 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -100,8 +100,10 @@ static void help(void) " '-h' with or without a command shows this help and lists the supported formats\n" " '-p' show progress of command (only certain commands)\n" " '-q' use Quiet mode - do not print any output (except errors)\n" - " '-S' indicates the consecutive number of bytes that must contain only zeros\n" - " for qemu-img to create a sparse image during conversion\n" + " '-S' indicates the consecutive number of bytes (defaults to 4096) that must\n" + " contain only zeros for qemu-img to create a sparse image during\n" + " conversion. if the number of bytes is 0 sparse files are disabled and\n" + " images will always be fully allocated\n" " '--output' takes the format in which the output must be done (human or json)\n" " '-n' skips the target volume creation (useful if the volume is created\n" " prior to running qemu-img)\n" @@ -1468,7 +1470,7 @@ 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); + int has_zero_init = min_sparse ? bdrv_has_zero_init(out_bs) : 0; sector_num = 0; // total number of sectors converted so far nb_sectors = total_sectors - sector_num; -- 1.7.9.5