From patchwork Fri Sep 13 10:25:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 274715 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 E1F6C2C0134 for ; Fri, 13 Sep 2013 20:31:21 +1000 (EST) Received: from localhost ([::1]:45892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKQem-0003eD-0b for incoming@patchwork.ozlabs.org; Fri, 13 Sep 2013 06:31:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKQb1-000762-3J for qemu-devel@nongnu.org; Fri, 13 Sep 2013 06:27:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VKQas-0003Sq-O8 for qemu-devel@nongnu.org; Fri, 13 Sep 2013 06:27:27 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:35010 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKQas-0003Rj-86 for qemu-devel@nongnu.org; Fri, 13 Sep 2013 06:27:18 -0400 Received: (qmail 3023 invoked by uid 89); 13 Sep 2013 10:27:17 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.97.8/17847. hbedv: 8.2.12.118/7.11.102.86. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 1.124504 secs); 13 Sep 2013 10:27:17 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 13 Sep 2013 10:27:16 -0000 X-GL_Whitelist: yes 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 189F5206AF; Fri, 13 Sep 2013 12:25:15 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 1639A6128B; Fri, 13 Sep 2013 12:25:17 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Fri, 13 Sep 2013 12:25:05 +0200 Message-Id: <1379067909-22984-9-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1379067909-22984-1-git-send-email-pl@kamp.de> References: <1379067909-22984-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] [PATCH 08/12] qemu-img: conditionally zero out target on convert 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 if the target has_zero_init = 0, but supports efficiently writing zeroes by unmapping we call bdrv_zeroize to avoid fully allocating the target. this currently is designed especially for iscsi. Signed-off-by: Peter Lieven --- qemu-img.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 3e5e388..6eaddc6 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1354,7 +1354,8 @@ static int img_convert(int argc, char **argv) } } - flags = BDRV_O_RDWR; + flags = BDRV_O_RDWR | BDRV_O_UNMAP; + ret = bdrv_parse_cache_flags(cache, &flags); if (ret < 0) { error_report("Invalid cache option: %s", cache); @@ -1386,12 +1387,13 @@ static int img_convert(int argc, char **argv) } } + ret = bdrv_get_info(out_bs, &bdi); + if (ret < 0) { + error_report("could not get block driver info"); + goto out; + } + if (compress) { - ret = bdrv_get_info(out_bs, &bdi); - if (ret < 0) { - error_report("could not get block driver info"); - goto out; - } cluster_size = bdi.cluster_size; if (cluster_size <= 0 || cluster_size > IO_BUF_SIZE) { error_report("invalid cluster size"); @@ -1470,6 +1472,14 @@ static int img_convert(int argc, char **argv) } else { int has_zero_init = bdrv_has_zero_init(out_bs); + if (!has_zero_init && !out_baseimg && bdi.discard_write_zeroes) { + ret = bdrv_zeroize(out_bs, BDRV_REQ_MAY_UNMAP); + if (ret < 0) { + goto out; + } + has_zero_init = 1; + } + sector_num = 0; // total number of sectors converted so far nb_sectors = total_sectors - sector_num; if (nb_sectors != 0) {