From patchwork Tue Oct 8 11:58:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 281439 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1022C2C009C for ; Tue, 8 Oct 2013 23:25:17 +1100 (EST) Received: from localhost ([::1]:36477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTWLj-0007sF-4h for incoming@patchwork.ozlabs.org; Tue, 08 Oct 2013 08:25:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTVyz-0002kF-O4 for qemu-devel@nongnu.org; Tue, 08 Oct 2013 08:02:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTVyt-0004ks-Of for qemu-devel@nongnu.org; Tue, 08 Oct 2013 08:01:45 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:42544 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTVyt-0004kA-DI for qemu-devel@nongnu.org; Tue, 08 Oct 2013 08:01:39 -0400 Received: (qmail 5593 invoked by uid 89); 8 Oct 2013 12:01:38 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98/17948. hbedv: 8.2.12.126/7.11.106.104. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 1.204118 secs); 08 Oct 2013 12:01:38 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 8 Oct 2013 12:01:37 -0000 Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id CF529206B8; Tue, 8 Oct 2013 13:58:10 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id B7D205FB8D; Tue, 8 Oct 2013 13:58:12 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 8 Oct 2013 13:58:09 +0200 Message-Id: <1381233491-17019-16-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1381233491-17019-1-git-send-email-pl@kamp.de> References: <1381233491-17019-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, ronniesahlberg@gmail.com, Peter Lieven , stefanha@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com Subject: [Qemu-devel] [PATCHv4 15/17] qemu-img: add support for fully allocated images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Peter Lieven --- qemu-img.c | 8 +++++--- qemu-img.texi | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 926f0a0..c6eff15 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 4k) 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" @@ -1465,7 +1467,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; diff --git a/qemu-img.texi b/qemu-img.texi index 768054e..51a1ee5 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -193,6 +193,11 @@ Image conversion is also useful to get smaller image when using a growable format such as @code{qcow} or @code{cow}: the empty sectors are detected and suppressed from the destination image. +@var{sparse_size} indicates the consecutive number of bytes (defaults to 4k) +that must contain only zeros for qemu-img to create a sparse image during +conversion. If the number of bytes is 0 sparse files are disabled and +images will always be fully allocated. + You can use the @var{backing_file} option to force the output image to be created as a copy on write image of the specified base image; the @var{backing_file} should have the same content as the input's base image,