From nobody Fri Nov 14 17:01:15 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1588700603; cv=none; d=zohomail.com; s=zohoarc; b=ZLjer/7njDXAt0R9Oi79vD3Xae/aNh47ZgFumn04NoJxYo61Bwu+PkTsC0qqIuXthGTkBLsER6Rr6dbJHTX8l8HEMU4Qzz4IKuww8B1MW2gBfhSZOxANd5OkWOxT8rufnHxvgvDLN4KavM7McGD1UzQqpgltdOAO4rXBvGyCAq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588700603; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z6Sirn77vMX1Jt9As3slGQi/1uigB5rELVH0ztdF5Es=; b=UMNJAqHkzdKk/DJa24A5T/Z0TFWfWUT3+lCSf47XpX3iqvrnY8fen+r6JtsLPqmx2MSY2R3nbR4gIXG7s8QQL/hHPb1M9+J5EOO2CJ3fnBgZiRz7rQU2QYM92QjGWHS1KBYAzA5G4lGez8qT/Wj3RpyJMce77x3/d5KE8Mro1HM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588700603313615.0055425735629; Tue, 5 May 2020 10:43:23 -0700 (PDT) Received: from localhost ([::1]:47594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jW1bG-0003qX-31 for importer@patchew.org; Tue, 05 May 2020 13:43:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jW1XM-0006H8-CV; Tue, 05 May 2020 13:39:20 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:38782) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jW1XJ-00089Q-A3; Tue, 05 May 2020 13:39:20 -0400 Received: from static.160.43.0.81.ibercom.com ([81.0.43.160] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jW1Ws-00025R-8H; Tue, 05 May 2020 19:38:50 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jW1Wc-00043t-Pb; Tue, 05 May 2020 19:38:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Z6Sirn77vMX1Jt9As3slGQi/1uigB5rELVH0ztdF5Es=; b=Y2+Rr/KplF1QgmDbs/QGElGY2lP7o6K57wKAPi3QcmAJDRRrkx9lSvp40hPFm0PXLWmp2yv2N+FONvrhJBtNMty2upr7DA/7uBd/h92KiWAbGsR0IyvUBDB5JM43IhiC6OtBVC7wJw1qfro04Vo/IndTo7fY7onutneif4gR55OmbzRuuIoNKCYnecoWaA/0Xh6sqZyLnlotV53YVmkpZb2FlAJjrIu1fTzZyagluWUml7GNO3P8ptXnxNKFYzBhs8cH2qfX5LxjoV68Fh566Ga/0FQkoh0xGYW7gFMwMuSmTcShjpS8mgOSpTaGnjiK5/QBpZGkboVDFeVZXD2oRA==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v5 11/31] qcow2: Add offset_into_subcluster() and size_to_subclusters() Date: Tue, 5 May 2020 19:38:11 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=178.60.130.6; envelope-from=berto@igalia.com; helo=fanzine.igalia.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/05 13:38:50 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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_PASS=-0.001, URIBL_BLOCKED=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: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , Alberto Garcia , 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) Content-Type: text/plain; charset="utf-8" Like offset_into_cluster() and size_to_clusters(), but for subclusters. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake --- block/qcow2.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/qcow2.h b/block/qcow2.h index e68febb15b..8b1ed1cbcf 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -537,11 +537,21 @@ static inline int64_t offset_into_cluster(BDRVQcow2St= ate *s, int64_t offset) return offset & (s->cluster_size - 1); } =20 +static inline int64_t offset_into_subcluster(BDRVQcow2State *s, int64_t of= fset) +{ + return offset & (s->subcluster_size - 1); +} + static inline uint64_t size_to_clusters(BDRVQcow2State *s, uint64_t size) { return (size + (s->cluster_size - 1)) >> s->cluster_bits; } =20 +static inline uint64_t size_to_subclusters(BDRVQcow2State *s, uint64_t siz= e) +{ + return (size + (s->subcluster_size - 1)) >> s->subcluster_bits; +} + static inline int64_t size_to_l1(BDRVQcow2State *s, int64_t size) { int shift =3D s->cluster_bits + s->l2_bits; --=20 2.20.1