From nobody Thu May 2 21:38:04 2024 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 1507563683216566.813465462351; Mon, 9 Oct 2017 08:41:23 -0700 (PDT) Received: from localhost ([::1]:58428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1aBE-0000pE-K7 for importer@patchew.org; Mon, 09 Oct 2017 11:41:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1a9L-00085g-Ri for qemu-devel@nongnu.org; Mon, 09 Oct 2017 11:39:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1a9H-0006co-Pb for qemu-devel@nongnu.org; Mon, 09 Oct 2017 11:39:23 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:47248) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1a9H-0006b2-Cs; Mon, 09 Oct 2017 11:39:19 -0400 Received: from [88.128.80.52] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1e1a9D-00051c-MF; Mon, 09 Oct 2017 17:39:15 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1e1a8z-0005JX-Um; Mon, 09 Oct 2017 18:39:01 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Message-Id:Date:Subject:Cc:To:From; bh=K7GjTduS9/wxJWSnRLlbAmYUVSizyyIvHLJFdEQtLW4=; b=Vq2EsPxW7IVCL2CFQuzUpKukw6lJjh0wZX71X8vZ/NdPc3A2FsMSTlVjotWtHSOpoanMQJof1E7MY+1kV/rTWoblzF38X2RvO37jv2CJ3iUCILH1W/zR2BX9TKtbp3SPyJzqABInomMakDKDDlb9cVqcTARbFiKu8RFI5blXsnl8D30wWSH14lSNuTiLyFg5agao6MD/JACJDLvJz2Q+ng4bEhAn1JsDBxQNJht3A2j3kXZqIMcDIx9vhXtrLxT40gofGoPimhdOy+23ySeRnmcqv2YtYi8eLJw2HyagmX9ukVlrWRSe6fdsGDlmdTwCWeuLw8KovoQMy5sAfUEU5Q==; From: Alberto Garcia To: Date: Mon, 9 Oct 2017 17:38:56 +0200 Message-Id: <20171009153856.20387-1-berto@igalia.com> X-Mailer: git-send-email 2.11.0 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 v2] qcow2: Use BDRV_SECTOR_BITS instead of its literal value 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 , Alberto Garcia , qemu-devel@nongnu.org, qemu-block@nongnu.org, Max Reitz 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" BDRV_SECTOR_BITS is defined to be 9 in block.h (and BDRV_SECTOR_SIZE is calculated from that), but there are still a couple of places where we are using the literal value instead of the macro. Signed-off-by: Alberto Garcia --- block/qcow2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index f63d1831f8..dff903e05c 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1139,7 +1139,7 @@ static int qcow2_do_open(BlockDriverState *bs, QDict = *options, int flags, =20 s->cluster_bits =3D header.cluster_bits; s->cluster_size =3D 1 << s->cluster_bits; - s->cluster_sectors =3D 1 << (s->cluster_bits - 9); + s->cluster_sectors =3D 1 << (s->cluster_bits - BDRV_SECTOR_BITS); =20 /* Initialise version 3 header fields */ if (header.version =3D=3D 2) { @@ -1636,7 +1636,7 @@ static int64_t coroutine_fn qcow2_co_get_block_status= (BlockDriverState *bs, =20 bytes =3D MIN(INT_MAX, nb_sectors * BDRV_SECTOR_SIZE); qemu_co_mutex_lock(&s->lock); - ret =3D qcow2_get_cluster_offset(bs, sector_num << 9, &bytes, + ret =3D qcow2_get_cluster_offset(bs, sector_num << BDRV_SECTOR_BITS, &= bytes, &cluster_offset); qemu_co_mutex_unlock(&s->lock); if (ret < 0) { --=20 2.11.0