From nobody Mon Feb 9 00:37:36 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=1555343955; cv=none; d=zoho.com; s=zohoarc; b=GgLw87CKwe7r+z9bHhR+TMyizE92BHvEWfp86zWaZg5Ijdugsje1+HzUepKGRV0cP1sJUK35QCP49qTbD3bIvpL1wggAkhOdT9TaFAa4mcGaAti+75Xh7uRA85TRCafEhJeGH0iwhIrW7bbQYR+xF6a6tYXVYnRPlWWMuQ7G2U0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555343955; 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=Hh1hnOs0+HjCt7prkmNWu8qbonq6Qka876pQjWPZTy4=; b=SFHGLqNbvGFuC02ou1Wui4MhLVRgoLgWBFyIpsnbgPL3re7+eE31mQOX9EbDtgLVWm4P0Tls0hHhE2h9oxRnveYd1DvF1Lb750duwRRnNFq29ZNYqiO6oXSYZSVD35rUU4xNhQiXGWYApqgqxrQUsnVJM+9fvb9tnRqbbS+nd1k= 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 1555343955024868.1026359733872; Mon, 15 Apr 2019 08:59:15 -0700 (PDT) Received: from localhost ([127.0.0.1]:52213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG40l-000279-3q for importer@patchew.org; Mon, 15 Apr 2019 11:59:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG3x7-0007iW-KE for qemu-devel@nongnu.org; Mon, 15 Apr 2019 11:55:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hG3x6-0003ZO-GU for qemu-devel@nongnu.org; Mon, 15 Apr 2019 11:55:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33160) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hG3x3-0003RA-1I; Mon, 15 Apr 2019 11:55:21 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 557183092669; Mon, 15 Apr 2019 15:55:17 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-113.ams2.redhat.com [10.36.117.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD58A60123; Mon, 15 Apr 2019 15:55:14 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 15 Apr 2019 17:54:51 +0200 Message-Id: <20190415155452.5115-4-kwolf@redhat.com> In-Reply-To: <20190415155452.5115-1-kwolf@redhat.com> References: <20190415155452.5115-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 15 Apr 2019 15:55:17 +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 3/4] qcow2: Add errp to preallocate_co() 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, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We'll add a bdrv_co_truncate() call in the next patch which can return an Error that we don't want to discard. So add an errp parameter to preallocate_co(). Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- block/qcow2.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index dfac74c264..b4f9f5a240 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2721,7 +2721,7 @@ static int qcow2_set_up_encryption(BlockDriverState *= bs, * Returns: 0 on success, -errno on failure. */ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offs= et, - uint64_t new_length) + uint64_t new_length, Error **errp) { BDRVQcow2State *s =3D bs->opaque; uint64_t bytes; @@ -2738,6 +2738,7 @@ static int coroutine_fn preallocate_co(BlockDriverSta= te *bs, uint64_t offset, ret =3D qcow2_alloc_cluster_offset(bs, offset, &cur_bytes, &host_offset, &meta); if (ret < 0) { + error_setg_errno(errp, -ret, "Allocating clusters failed"); return ret; } =20 @@ -2746,6 +2747,7 @@ static int coroutine_fn preallocate_co(BlockDriverSta= te *bs, uint64_t offset, =20 ret =3D qcow2_alloc_cluster_link_l2(bs, meta); if (ret < 0) { + error_setg_errno(errp, -ret, "Mapping clusters failed"); qcow2_free_any_clusters(bs, meta->alloc_offset, meta->nb_clusters, QCOW2_DISCARD_N= EVER); return ret; @@ -2775,6 +2777,7 @@ static int coroutine_fn preallocate_co(BlockDriverSta= te *bs, uint64_t offset, ret =3D bdrv_pwrite(s->data_file, (host_offset + cur_bytes) - 1, &data, 1); if (ret < 0) { + error_setg_errno(errp, -ret, "Writing to EOF failed"); return ret; } } @@ -3748,9 +3751,8 @@ static int coroutine_fn qcow2_co_truncate(BlockDriver= State *bs, int64_t offset, break; =20 case PREALLOC_MODE_METADATA: - ret =3D preallocate_co(bs, old_length, offset); + ret =3D preallocate_co(bs, old_length, offset, errp); if (ret < 0) { - error_setg_errno(errp, -ret, "Preallocation failed"); goto fail; } break; @@ -3766,9 +3768,8 @@ static int coroutine_fn qcow2_co_truncate(BlockDriver= State *bs, int64_t offset, /* With a data file, preallocation means just allocating the metad= ata * and forwarding the truncate request to the data file */ if (has_data_file(bs)) { - ret =3D preallocate_co(bs, old_length, offset); + ret =3D preallocate_co(bs, old_length, offset, errp); if (ret < 0) { - error_setg_errno(errp, -ret, "Preallocation failed"); goto fail; } break; --=20 2.20.1