From patchwork Thu Oct 12 13:05:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 824826 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="pWlQ4E8E"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yCWbh1r11z9t2m for ; Fri, 13 Oct 2017 00:17:20 +1100 (AEDT) Received: from localhost ([::1]:45456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2dMU-0005jv-8f for incoming@patchwork.ozlabs.org; Thu, 12 Oct 2017 09:17:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2dGT-0001HZ-Go for qemu-devel@nongnu.org; Thu, 12 Oct 2017 09:11:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2dGP-0001fd-D8 for qemu-devel@nongnu.org; Thu, 12 Oct 2017 09:11:05 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:52380) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e2dGP-0000Lc-3Y; Thu, 12 Oct 2017 09:11:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=wkojKuYkCxgIE6sBvxs7K8OAvNWYGOouYqEWfKFX8bc=; b=pWlQ4E8ERwPgT2q0Og9a0diHZM99hWI4FyzyeNLVTqdtQ+k96jFdS2IeWQyFUWQFxKN4/ZOaG5hjthMs5Zr0sOPe5/D6s7tQABoHXjhmrRBBuRgWmmwtYD0c8TwqU6a6aMEavZOemX+lelppBYrg2TZ7Dl7RP33DSxSlaWXf0m3NnaS28C6AOQoeKgmPd9KZ7khxTgnH4DXdBCaoyCT1HcPNbeGlwsIojkt6nj0RSwkDwVn4d144355RbkyQhDr9hGiNpvHYHTwJF14Dih1scVkcxAe3NeXQtdYFyIAAUxtXrn4u+qEbYXAJFwNlBgoBLiu+09sWWPBpiqOqNkwHng==; Received: from a88-114-101-76.elisa-laajakaista.fi ([88.114.101.76] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1e2dFs-0006MO-Iq; Thu, 12 Oct 2017 15:10:28 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1e2dCz-0003ak-De; Thu, 12 Oct 2017 16:07:29 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 12 Oct 2017 16:05:43 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH 29/31] qcow2: Rename l2_table in count_contiguous_clusters_unallocated() 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: Kevin Wolf , "Denis V . Lunev" , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This function doesn't need any changes to support L2 slices, but since it's now dealing with slices intead of full tables, the l2_table variable is renamed for clarity. Signed-off-by: Alberto Garcia --- block/qcow2-cluster.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index a961901da0..bc94467733 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -399,10 +399,10 @@ static int count_contiguous_clusters(int nb_clusters, int cluster_size, /* * Checks how many consecutive unallocated clusters in a given L2 - * table have the same cluster type. + * slice have the same cluster type. */ static int count_contiguous_clusters_unallocated(int nb_clusters, - uint64_t *l2_table, + uint64_t *l2_slice, QCow2ClusterType wanted_type) { int i; @@ -410,7 +410,7 @@ static int count_contiguous_clusters_unallocated(int nb_clusters, assert(wanted_type == QCOW2_CLUSTER_ZERO_PLAIN || wanted_type == QCOW2_CLUSTER_UNALLOCATED); for (i = 0; i < nb_clusters; i++) { - uint64_t entry = be64_to_cpu(l2_table[i]); + uint64_t entry = be64_to_cpu(l2_slice[i]); QCow2ClusterType type = qcow2_get_cluster_type(entry); if (type != wanted_type) {