{"id":1307010,"url":"http://patchwork.ozlabs.org/api/patches/1307010/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/22bb483be1b70b26e9fb61faf3579195f2df99bf.1591801197.git.berto@igalia.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<22bb483be1b70b26e9fb61faf3579195f2df99bf.1591801197.git.berto@igalia.com>","list_archive_url":null,"date":"2020-06-10T15:02:42","name":"[v8,04/34] qcow2: Split cluster_needs_cow() out of count_cow_clusters()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ce4d6aee879a8403436c98d23b573e445d043fa5","submitter":{"id":65704,"url":"http://patchwork.ozlabs.org/api/people/65704/?format=json","name":"Alberto Garcia","email":"berto@igalia.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/22bb483be1b70b26e9fb61faf3579195f2df99bf.1591801197.git.berto@igalia.com/mbox/","series":[{"id":182563,"url":"http://patchwork.ozlabs.org/api/series/182563/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=182563","date":"2020-06-10T15:02:49","name":"Add subcluster allocation to qcow2","version":8,"mbox":"http://patchwork.ozlabs.org/series/182563/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1307010/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1307010/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=)","ozlabs.org;\n dmarc=none (p=none dis=none) header.from=igalia.com","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256\n header.s=20170329 header.b=MqafXVFk;\n\tdkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49hr5N20djz9sQx\n\tfor ; Thu, 11 Jun 2020 01:10:16 +1000 (AEST)","from localhost ([::1]:38754 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1jj2Mm-0002DT-Qw\n\tfor incoming@patchwork.ozlabs.org; Wed, 10 Jun 2020 11:10:13 -0400","from eggs.gnu.org ([2001:470:142:3::10]:35968)\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1jj2Gd-0002Kr-Su; Wed, 10 Jun 2020 11:03:51 -0400","from fanzine.igalia.com ([178.60.130.6]:58035)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1jj2GX-0006vw-Ay; Wed, 10 Jun 2020 11:03:51 -0400","from [81.0.38.199] (helo=perseus.local)\n by fanzine.igalia.com with esmtpsa\n (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim)\n id 1jj2GR-0007gi-7E; Wed, 10 Jun 2020 17:03:39 +0200","from berto by perseus.local with local (Exim 4.92)\n (envelope-from )\n 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;\n s=20170329;\n h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From;\n bh=x44WykpORUb7jKPsPZokuc5MU7JgoaeSdWXwYoNGUz0=;\n 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\n count_cow_clusters()","Date":"Wed, 10 Jun 2020 17:02:42 +0200","Message-Id":"\n <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":"8bit","Received-SPF":"pass client-ip=178.60.130.6; envelope-from=berto@igalia.com;\n 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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"Kevin Wolf ,\n Vladimir Sementsov-Ogievskiy ,\n Alberto Garcia , qemu-block@nongnu.org,\n Derek Su , Max Reitz ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n "},"content":"We are going to need it in other places.\n\nSigned-off-by: Alberto Garcia \nReviewed-by: Vladimir Sementsov-Ogievskiy \nReviewed-by: Max Reitz \n---\n block/qcow2-cluster.c | 34 +++++++++++++++++++---------------\n 1 file changed, 19 insertions(+), 15 deletions(-)","diff":"diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c\nindex 61ad638bdc..80f9787461 100644\n--- a/block/qcow2-cluster.c\n+++ b/block/qcow2-cluster.c\n@@ -1087,6 +1087,24 @@ static void calculate_l2_meta(BlockDriverState *bs,\n QLIST_INSERT_HEAD(&s->cluster_allocs, *m, next_in_flight);\n }\n \n+/* Returns true if writing to a cluster requires COW */\n+static bool cluster_needs_cow(BlockDriverState *bs, uint64_t l2_entry)\n+{\n+ switch (qcow2_get_cluster_type(bs, l2_entry)) {\n+ case QCOW2_CLUSTER_NORMAL:\n+ if (l2_entry & QCOW_OFLAG_COPIED) {\n+ return false;\n+ }\n+ case QCOW2_CLUSTER_UNALLOCATED:\n+ case QCOW2_CLUSTER_COMPRESSED:\n+ case QCOW2_CLUSTER_ZERO_PLAIN:\n+ case QCOW2_CLUSTER_ZERO_ALLOC:\n+ return true;\n+ default:\n+ abort();\n+ }\n+}\n+\n /*\n * Returns the number of contiguous clusters that can be used for an allocating\n * write, but require COW to be performed (this includes yet unallocated space,\n@@ -1099,25 +1117,11 @@ static int count_cow_clusters(BlockDriverState *bs, int nb_clusters,\n \n for (i = 0; i < nb_clusters; i++) {\n uint64_t l2_entry = be64_to_cpu(l2_slice[l2_index + i]);\n- QCow2ClusterType cluster_type = qcow2_get_cluster_type(bs, l2_entry);\n-\n- switch(cluster_type) {\n- case QCOW2_CLUSTER_NORMAL:\n- if (l2_entry & QCOW_OFLAG_COPIED) {\n- goto out;\n- }\n+ if (!cluster_needs_cow(bs, l2_entry)) {\n break;\n- case QCOW2_CLUSTER_UNALLOCATED:\n- case QCOW2_CLUSTER_COMPRESSED:\n- case QCOW2_CLUSTER_ZERO_PLAIN:\n- case QCOW2_CLUSTER_ZERO_ALLOC:\n- break;\n- default:\n- abort();\n }\n }\n \n-out:\n assert(i <= nb_clusters);\n return i;\n }\n","prefixes":["v8","04/34"]}