From patchwork Fri Jan 26 15:00:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 866417 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="FX2+MLbp"; 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 3zSjQH4R2Pz9ryQ for ; Sat, 27 Jan 2018 02:25:11 +1100 (AEDT) Received: from localhost ([::1]:33251 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef5sL-0002NH-IW for incoming@patchwork.ozlabs.org; Fri, 26 Jan 2018 10:25:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef5o4-0007ku-BK for qemu-devel@nongnu.org; Fri, 26 Jan 2018 10:20:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ef5o2-00017Y-Sw for qemu-devel@nongnu.org; Fri, 26 Jan 2018 10:20:44 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:54284) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ef5o2-00016S-JE; Fri, 26 Jan 2018 10:20:42 -0500 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=rX1jFZUUU7eBsKyvGQlmYgOo7LRjJaMSqt8tFjYXNL4=; b=FX2+MLbpntqrCtVfHuAqq7GCiLEbKKQcHmu66g6HMrAJXvTcvv4LgYnRLuIn3ebCK0a1d6vht1KuHQq7Qha8/SQ0jJl4+G2y8ytgd68Fc/g7IF6Ryv1vKi3TuX6P18TgOTID4g8oS/W2kuoHSLyyaRJ+SnP7rXn0SoE0PhrcRyQf+kj1feSVdlkxRHCyXdutGOnXtUurklz0zpVfHHGrTkwj6shnTgGidOmd00qe76uH1Z8PwEOUII7GF8/JIZYrrSRBpXOHNZFNbiMM+rJvOaWTHJT0GY/H0yex66ZiUDRCCHO11yxVAHNs/W95ezmhK/R/T+Yzf7SpzF6IKLYjRQ==; Received: from 88-114-101-230.elisa-laajakaista.fi ([88.114.101.230] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1ef5Ud-0007h0-Tp; Fri, 26 Jan 2018 16:00:40 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1ef5UI-000886-20; Fri, 26 Jan 2018 17:00:18 +0200 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Fri, 26 Jan 2018 17:00:01 +0200 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 v3 34/39] 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 , Anton Nefedov , Alberto Garcia , qemu-block@nongnu.org, Max Reitz , "Denis V . Lunev" 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 Reviewed-by: Eric Blake Reviewed-by: Max Reitz --- 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 60c38a71f1..5422c202fb 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -407,10 +407,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; @@ -418,7 +418,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) {