From nobody Mon Feb 9 11:31:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563988400; cv=none; d=zoho.com; s=zohoarc; b=elNkmMCPTpnmKFxArMJnILeJZ62LdwCLnJubwGbPO0NG3Tb2z/GXbYFekWTd6toy8bxtzaIiamp2+H8mMIMDxVOsZfZzRB7OnVY3OT8KgQ34L/VUmfLzFM3ZgX0HeFhhpRkZ2E8/7ntL42ZLCO4/IXHtxLOaNG3h0DMKQJE87I4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563988400; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=5hEGGa+FFpfi3nBVmBmOTCyHaIgefkG53Z3/HMrGfl8=; b=R5+H+Gas+uUG84VLZiJi4z05YPEos23H6N8p6OlpHbYkzEuhN3CeXnDIx1lr1Ta4vzas0DbbeubI3VstAilCzme3NLW2T409UAMoMw/uq6Pkra4r7UIGkTCb0HcIEoyBvxkm17bZbv5AdY2mQQkaj4Jw1l8YsB/Ve2Feh0zgQ7I= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563988400316518.5196495720029; Wed, 24 Jul 2019 10:13:20 -0700 (PDT) Received: from localhost ([::1]:53594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqKpG-0004SC-IT for importer@patchew.org; Wed, 24 Jul 2019 13:13:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49364) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqKot-0003Nv-Fv for qemu-devel@nongnu.org; Wed, 24 Jul 2019 13:12:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqKos-0004XD-GU for qemu-devel@nongnu.org; Wed, 24 Jul 2019 13:12:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59218) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqKoo-0004FS-DU; Wed, 24 Jul 2019 13:12:46 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6FFA5356E7; Wed, 24 Jul 2019 17:12:45 +0000 (UTC) Received: from localhost (ovpn-204-115.brq.redhat.com [10.40.204.115]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DBE185C22D; Wed, 24 Jul 2019 17:12:44 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 24 Jul 2019 19:12:29 +0200 Message-Id: <20190724171239.8764-2-mreitz@redhat.com> In-Reply-To: <20190724171239.8764-1-mreitz@redhat.com> References: <20190724171239.8764-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 24 Jul 2019 17:12:45 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 01/11] qemu-img: Fix bdrv_has_zero_init() use in convert X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stefano Garzarella , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" bdrv_has_zero_init() only has meaning for newly created images or image areas. If qemu-img convert did not create the image itself, it cannot rely on bdrv_has_zero_init()'s result to carry any meaning. Signed-off-by: Max Reitz Reviewed-by: Maxim Levitsky Reviewed-by: Stefano Garzarella --- qemu-img.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 79983772de..0f4be80c10 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1578,6 +1578,7 @@ typedef struct ImgConvertState { bool has_zero_init; bool compressed; bool unallocated_blocks_are_zero; + bool target_is_new; bool target_has_backing; int64_t target_backing_sectors; /* negative if unknown */ bool wr_in_order; @@ -1975,9 +1976,11 @@ static int convert_do_copy(ImgConvertState *s) int64_t sector_num =3D 0; =20 /* Check whether we have zero initialisation or can get it efficiently= */ - s->has_zero_init =3D s->min_sparse && !s->target_has_backing - ? bdrv_has_zero_init(blk_bs(s->target)) - : false; + if (s->target_is_new && s->min_sparse && !s->target_has_backing) { + s->has_zero_init =3D bdrv_has_zero_init(blk_bs(s->target)); + } else { + s->has_zero_init =3D false; + } =20 if (!s->has_zero_init && !s->target_has_backing && bdrv_can_write_zeroes_with_unmap(blk_bs(s->target))) @@ -2423,6 +2426,8 @@ static int img_convert(int argc, char **argv) } } =20 + s.target_is_new =3D !skip_create; + flags =3D s.min_sparse ? (BDRV_O_RDWR | BDRV_O_UNMAP) : BDRV_O_RDWR; ret =3D bdrv_parse_cache_mode(cache, &flags, &writethrough); if (ret < 0) { --=20 2.21.0