From nobody Tue Apr 15 11:36:10 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 1552050543848420.4677997792438; Fri, 8 Mar 2019 05:09:03 -0800 (PST) Received: from localhost ([127.0.0.1]:42760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2FFC-0007PK-PY for importer@patchew.org; Fri, 08 Mar 2019 08:08:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2F5o-0008T8-K6 for qemu-devel@nongnu.org; Fri, 08 Mar 2019 07:59:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2F5l-0007Up-P0 for qemu-devel@nongnu.org; Fri, 08 Mar 2019 07:59:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41958) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2F5f-0006bd-OX; Fri, 08 Mar 2019 07:59:07 -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 E8C013092651; Fri, 8 Mar 2019 12:59:03 +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 D9CEC5D704; Fri, 8 Mar 2019 12:59:02 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 8 Mar 2019 13:58:07 +0100 Message-Id: <20190308125823.32535-18-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.43]); Fri, 08 Mar 2019 12:59:03 +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 17/33] qcow2: Prepare count_contiguous_clusters() for external data file 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" Offset 0 can be valid for normal (allocated) clusters now, so use qcow2_get_cluster_type() instead. Signed-off-by: Kevin Wolf --- block/qcow2-cluster.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 9cc8f0f3e4..660161bf00 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -389,12 +389,12 @@ static int count_contiguous_clusters(BlockDriverState= *bs, int nb_clusters, uint64_t first_entry =3D be64_to_cpu(l2_slice[0]); uint64_t offset =3D first_entry & mask; =20 - if (!offset) { + first_cluster_type =3D qcow2_get_cluster_type(bs, first_entry); + if (first_cluster_type =3D=3D QCOW2_CLUSTER_UNALLOCATED) { return 0; } =20 /* must be allocated */ - first_cluster_type =3D qcow2_get_cluster_type(bs, first_entry); assert(first_cluster_type =3D=3D QCOW2_CLUSTER_NORMAL || first_cluster_type =3D=3D QCOW2_CLUSTER_ZERO_ALLOC); =20 --=20 2.20.1