From nobody Tue Apr 15 11:33:47 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552050679025999.3815538660626; Fri, 8 Mar 2019 05:11:19 -0800 (PST) Received: from localhost ([127.0.0.1]:42824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2FHJ-0000uG-0l for importer@patchew.org; Fri, 08 Mar 2019 08:11:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2F5h-0008OZ-Kd for qemu-devel@nongnu.org; Fri, 08 Mar 2019 07:59:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2F5c-0006ex-Nl for qemu-devel@nongnu.org; Fri, 08 Mar 2019 07:59:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46486) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2F5T-0005gC-HW; Fri, 08 Mar 2019 07:58:56 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 998EC307D844; Fri, 8 Mar 2019 12:58:53 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-27.ams2.redhat.com [10.36.117.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 711775D704; Fri, 8 Mar 2019 12:58:51 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 8 Mar 2019 13:58:02 +0100 Message-Id: <20190308125823.32535-13-kwolf@redhat.com> In-Reply-To: <20190308125823.32535-1-kwolf@redhat.com> References: <20190308125823.32535-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 08 Mar 2019 12:58:53 +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] [PULL 12/33] qcow2: Simplify preallocation code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Image creation already involves a bdrv_co_truncate() call, which allows to specify a preallocation mode. Just pass the right mode there and remove the code that is made redundant by this. Signed-off-by: Kevin Wolf --- block/qcow2.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 48d22f48d5..9489d795e5 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2952,19 +2952,6 @@ qcow2_co_create(BlockdevCreateOptions *create_option= s, Error **errp) goto out; } =20 - if (qcow2_opts->preallocation =3D=3D PREALLOC_MODE_FULL || - qcow2_opts->preallocation =3D=3D PREALLOC_MODE_FALLOC) - { - int64_t prealloc_size =3D - qcow2_calc_prealloc_size(qcow2_opts->size, cluster_size, - refcount_order); - - ret =3D blk_truncate(blk, prealloc_size, qcow2_opts->preallocation= , errp); - if (ret < 0) { - goto out; - } - } - /* Write the header */ QEMU_BUILD_BUG_ON((1 << MIN_CLUSTER_BITS) < sizeof(*header)); header =3D g_malloc0(cluster_size); @@ -3046,7 +3033,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options= , Error **errp) } =20 /* Okay, now that we have a valid image, let's give it the right size = */ - ret =3D blk_truncate(blk, qcow2_opts->size, PREALLOC_MODE_OFF, errp); + ret =3D blk_truncate(blk, qcow2_opts->size, qcow2_opts->preallocation,= errp); if (ret < 0) { error_prepend(errp, "Could not resize image: "); goto out; @@ -3078,19 +3065,6 @@ qcow2_co_create(BlockdevCreateOptions *create_option= s, Error **errp) } } =20 - /* And if we're supposed to preallocate metadata, do that now */ - if (qcow2_opts->preallocation !=3D PREALLOC_MODE_OFF) { - BDRVQcow2State *s =3D blk_bs(blk)->opaque; - qemu_co_mutex_lock(&s->lock); - ret =3D preallocate_co(blk_bs(blk), 0, qcow2_opts->size); - qemu_co_mutex_unlock(&s->lock); - - if (ret < 0) { - error_setg_errno(errp, -ret, "Could not preallocate metadata"); - goto out; - } - } - blk_unref(blk); blk =3D NULL; =20 --=20 2.20.1