From nobody Tue Apr 15 11:36:09 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 1552050882861367.11325279530786; Fri, 8 Mar 2019 05:14:42 -0800 (PST) Received: from localhost ([127.0.0.1]:42854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2FKf-0003sv-Oq for importer@patchew.org; Fri, 08 Mar 2019 08:14:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2F5w-0000Bs-W7 for qemu-devel@nongnu.org; Fri, 08 Mar 2019 07:59:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2F5v-0008Jt-0b for qemu-devel@nongnu.org; Fri, 08 Mar 2019 07:59:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42620) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2F5p-0007Xi-Q8; Fri, 08 Mar 2019 07:59:18 -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 064513089EC4; Fri, 8 Mar 2019 12:59:14 +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 E5F5D5D787; Fri, 8 Mar 2019 12:59:12 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 8 Mar 2019 13:58:13 +0100 Message-Id: <20190308125823.32535-24-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.44]); Fri, 08 Mar 2019 12:59:14 +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 23/33] qcow2: Support external data file in qemu-img check 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" For external data files, data clusters must be excluded from the refcount calculations. Instead, an implicit refcount of 1 is assumed for the COPIED flag. Compressed clusters and internal snapshots are incompatible with external data files, so print an error if they are in use for images with an external data file. Signed-off-by: Kevin Wolf --- block/qcow2-refcount.c | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index df73580e5d..e0fe322500 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1605,6 +1605,13 @@ static int check_refcounts_l2(BlockDriverState *bs, = BdrvCheckResult *res, res->corruptions++; } =20 + if (has_data_file(bs)) { + fprintf(stderr, "ERROR compressed cluster %d with data fil= e, " + "entry=3D0x%" PRIx64 "\n", i, l2_entry); + res->corruptions++; + break; + } + /* Mark cluster as used */ nb_csectors =3D ((l2_entry >> s->csize_shift) & s->csize_mask) + 1; @@ -1695,11 +1702,13 @@ static int check_refcounts_l2(BlockDriverState *bs,= BdrvCheckResult *res, } =20 /* Mark cluster as used */ - ret =3D qcow2_inc_refcounts_imrt(bs, res, - refcount_table, refcount_table_= size, - offset, s->cluster_size); - if (ret < 0) { - goto fail; + if (!has_data_file(bs)) { + ret =3D qcow2_inc_refcounts_imrt(bs, res, refcount_table, + refcount_table_size, + offset, s->cluster_size); + if (ret < 0) { + goto fail; + } } break; } @@ -1884,12 +1893,16 @@ static int check_oflag_copied(BlockDriverState *bs,= BdrvCheckResult *res, =20 if (cluster_type =3D=3D QCOW2_CLUSTER_NORMAL || cluster_type =3D=3D QCOW2_CLUSTER_ZERO_ALLOC) { - ret =3D qcow2_get_refcount(bs, - data_offset >> s->cluster_bits, - &refcount); - if (ret < 0) { - /* don't print message nor increment check_errors */ - continue; + if (has_data_file(bs)) { + refcount =3D 1; + } else { + ret =3D qcow2_get_refcount(bs, + data_offset >> s->cluster_bit= s, + &refcount); + if (ret < 0) { + /* don't print message nor increment check_errors = */ + continue; + } } if ((refcount =3D=3D 1) !=3D ((l2_entry & QCOW_OFLAG_COPIE= D) !=3D 0)) { fprintf(stderr, "%s OFLAG_COPIED data cluster: " @@ -2083,6 +2096,12 @@ static int calculate_refcounts(BlockDriverState *bs,= BdrvCheckResult *res, } =20 /* snapshots */ + if (has_data_file(bs) && s->nb_snapshots) { + fprintf(stderr, "ERROR %d snapshots in image with data file\n", + s->nb_snapshots); + res->corruptions++; + } + for (i =3D 0; i < s->nb_snapshots; i++) { sn =3D s->snapshots + i; if (offset_into_cluster(s, sn->l1_table_offset)) { --=20 2.20.1