From nobody Mon Feb 9 03:31:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1591801904; cv=none; d=zohomail.com; s=zohoarc; b=ZoeWVbGhIO8DZuICtOPGv0wOc7uMe+rybwrfip7nrO9BuWKKQOJOozcIX+wZmbyUhe5tVi9JIZXs6coEO92WabamqYCLQ3ntf8UVcpbgIfS1qCWA5HcoMPpe4CPR0p/4TZemeTFpleSiDvhcXCFT9e5D8gnWvAUBrXqbGUFA3Mk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591801904; 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; bh=x44WykpORUb7jKPsPZokuc5MU7JgoaeSdWXwYoNGUz0=; b=ZltxbU3CZKFXfaOywe7mM47zx2YC3F54nDLUsnv6DQC8ZsGf43wI9kAiLUPT9zLfX5gStFIntMnE7r3uU8HyuO5eZqng9m/sBscZWbsEb71rllcWWv01sKjtACt1kGOrMthxZQmmFKbZbFeE0o/Mm4UnQL5R/3zkeoR0Kx1E+nY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591801904274996.4043578670489; Wed, 10 Jun 2020 08:11:44 -0700 (PDT) Received: from localhost ([::1]:42812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jj2OE-00041M-Kb for importer@patchew.org; Wed, 10 Jun 2020 11:11:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jj2Gd-0002Kr-Su; Wed, 10 Jun 2020 11:03:51 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:58035) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jj2GX-0006vw-Ay; Wed, 10 Jun 2020 11:03:51 -0400 Received: from [81.0.38.199] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jj2GR-0007gi-7E; Wed, 10 Jun 2020 17:03:39 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jj2GB-0007Ma-Ox; Wed, 10 Jun 2020 17:03:23 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=x44WykpORUb7jKPsPZokuc5MU7JgoaeSdWXwYoNGUz0=; b=MqafXVFkNn/15r4J3crS1b1lYBI9YV/ykJbenJ0U1Ua+uAyKTfH7B/NmVGyQaNF+Je5jBv/ofRvQsxuS0vHsxOw4F2RQvVd7kr/0u6qtDaN+94u4sHH5+S0cpliWclolL33lwrJQAR6dqW5b5JtCrJxn5MhVLk0aJbDDZayqNZrqepGi79dsxVWzcwUKOlYILSzsHWRfWo+be8CApUFR8LchK2qbUGwaeuIP4wdTb+Bz7Vx+L8z6TZL1tJW74TauD2S8RKQcDn2Uy3zLlbxe5dtUQaxf68ndxwqrpkWZGMuN/a7rD1NsnnC48cats8RQ7dcJiLpKiXVm9hkzPyPVqw==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v8 04/34] qcow2: Split cluster_needs_cow() out of count_cow_clusters() Date: Wed, 10 Jun 2020 17:02:42 +0200 Message-Id: <22bb483be1b70b26e9fb61faf3579195f2df99bf.1591801197.git.berto@igalia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=178.60.130.6; envelope-from=berto@igalia.com; helo=fanzine.igalia.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/10 11:03:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 , Vladimir Sementsov-Ogievskiy , Alberto Garcia , qemu-block@nongnu.org, Derek Su , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We are going to need it in other places. Signed-off-by: Alberto Garcia Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/qcow2-cluster.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 61ad638bdc..80f9787461 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1087,6 +1087,24 @@ static void calculate_l2_meta(BlockDriverState *bs, QLIST_INSERT_HEAD(&s->cluster_allocs, *m, next_in_flight); } =20 +/* Returns true if writing to a cluster requires COW */ +static bool cluster_needs_cow(BlockDriverState *bs, uint64_t l2_entry) +{ + switch (qcow2_get_cluster_type(bs, l2_entry)) { + case QCOW2_CLUSTER_NORMAL: + if (l2_entry & QCOW_OFLAG_COPIED) { + return false; + } + case QCOW2_CLUSTER_UNALLOCATED: + case QCOW2_CLUSTER_COMPRESSED: + case QCOW2_CLUSTER_ZERO_PLAIN: + case QCOW2_CLUSTER_ZERO_ALLOC: + return true; + default: + abort(); + } +} + /* * Returns the number of contiguous clusters that can be used for an alloc= ating * write, but require COW to be performed (this includes yet unallocated s= pace, @@ -1099,25 +1117,11 @@ static int count_cow_clusters(BlockDriverState *bs,= int nb_clusters, =20 for (i =3D 0; i < nb_clusters; i++) { uint64_t l2_entry =3D be64_to_cpu(l2_slice[l2_index + i]); - QCow2ClusterType cluster_type =3D qcow2_get_cluster_type(bs, l2_en= try); - - switch(cluster_type) { - case QCOW2_CLUSTER_NORMAL: - if (l2_entry & QCOW_OFLAG_COPIED) { - goto out; - } + if (!cluster_needs_cow(bs, l2_entry)) { break; - case QCOW2_CLUSTER_UNALLOCATED: - case QCOW2_CLUSTER_COMPRESSED: - case QCOW2_CLUSTER_ZERO_PLAIN: - case QCOW2_CLUSTER_ZERO_ALLOC: - break; - default: - abort(); } } =20 -out: assert(i <=3D nb_clusters); return i; } --=20 2.20.1