From nobody Mon Feb 9 06:02:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516980332069655.4195945447639; Fri, 26 Jan 2018 07:25:32 -0800 (PST) Received: from localhost ([::1]:33252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef5se-0002nv-QT for importer@patchew.org; Fri, 26 Jan 2018 10:25:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef5no-0007VQ-49 for qemu-devel@nongnu.org; Fri, 26 Jan 2018 10:20:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ef5nn-0000tA-37 for qemu-devel@nongnu.org; Fri, 26 Jan 2018 10:20:28 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:54240) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ef5nm-0000sk-KZ; Fri, 26 Jan 2018 10:20:26 -0500 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 1ef5UT-0007gw-Ra; Fri, 26 Jan 2018 16:00:29 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1ef5UG-00086U-Ny; Fri, 26 Jan 2018 17:00:16 +0200 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=g5irMEdLDeYN93zgiGhQIqPefAasWexcyljT41J0s4U=; b=RbBHynFGI2K34kIgZAYmN4+687I0TEDXdzgAwBTrUWRuOTo9CafUDYnXT6lXSkanPACtxeaFYRCHBS+hwryCl+QCsbD1iX+2bMdfkcE3RfLc6K9nGvGfhGS02HgH7CAWDg/r+WJBq5Z7TvsDYCO5RKhMTU66kWuqLXjOaHyKZOUpMjMYoJCHmEFVfgUpYFKcYIyvEQi5fHpZlsDENR+d4+ayv6kUSmWID15l75THbuwEfqcLvkmqrTrE2HyyYancqTxk8wNeNC5P1Km2tbNvGIM+B6fQPe9JvDyKw8MtOky/x52GLnTe180szUCYa9HuCA2bjGpixQFB8k3A931rFQ==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Fri, 26 Jan 2018 16:59:31 +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 04/39] qcow2: Remove BDS parameter from qcow2_cache_get_table_idx() 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This function was only using the BlockDriverState parameter to get the cache table size (since it was equal to the cluster size). This is no longer necessary so this parameter can be removed. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake Reviewed-by: Max Reitz --- block/qcow2-cache.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c index a481ef499a..3749d55595 100644 --- a/block/qcow2-cache.c +++ b/block/qcow2-cache.c @@ -51,8 +51,7 @@ static inline void *qcow2_cache_get_table_addr(Qcow2Cache= *c, int table) return (uint8_t *) c->table_array + (size_t) table * c->table_size; } =20 -static inline int qcow2_cache_get_table_idx(BlockDriverState *bs, - Qcow2Cache *c, void *table) +static inline int qcow2_cache_get_table_idx(Qcow2Cache *c, void *table) { ptrdiff_t table_offset =3D (uint8_t *) table - (uint8_t *) c->table_ar= ray; int idx =3D table_offset / c->table_size; @@ -411,7 +410,7 @@ int qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Ca= che *c, uint64_t offset, =20 void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table) { - int i =3D qcow2_cache_get_table_idx(bs, c, *table); + int i =3D qcow2_cache_get_table_idx(c, *table); =20 c->entries[i].ref--; *table =3D NULL; @@ -426,7 +425,7 @@ void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *= c, void **table) void qcow2_cache_entry_mark_dirty(BlockDriverState *bs, Qcow2Cache *c, void *table) { - int i =3D qcow2_cache_get_table_idx(bs, c, table); + int i =3D qcow2_cache_get_table_idx(c, table); assert(c->entries[i].offset !=3D 0); c->entries[i].dirty =3D true; } @@ -446,7 +445,7 @@ void *qcow2_cache_is_table_offset(BlockDriverState *bs,= Qcow2Cache *c, =20 void qcow2_cache_discard(BlockDriverState *bs, Qcow2Cache *c, void *table) { - int i =3D qcow2_cache_get_table_idx(bs, c, table); + int i =3D qcow2_cache_get_table_idx(c, table); =20 assert(c->entries[i].ref =3D=3D 0); =20 --=20 2.11.0