From nobody Mon Feb 9 07:56:00 2026 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=1594397968; cv=none; d=zohomail.com; s=zohoarc; b=lzMBWj5jFAArkYk/E+XHnWW8Qwyp/vC117+mjpD7grDn+3ASrQmUQiyIlgxKbqnL7AcSJxPpG2v4ksq3HA2Viaq5Nhwhf5WwAJnd27kz05+qFaIFuNUS6dfeSm5jFpPdwkxs4O6I0WO+IJF3R5FJz148JZ8ULk3R34rL8IGFdns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594397968; 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=quDPSlunrrCmsJvyut+Ssrzu4WgMw45eo+aNiowNwG0=; b=VimpAvIA71YzEtf/DOu169Q7XjCFwsGg8hYP3TxmDX9S+D/jmioLMASYlcD27+Ebrrs/n/DP3gAp227esgr9f9jpr8Bx9l/P0y+o40aa22qM1w3HAjZfEKq8j5TXA0TgEaQ1FxuFtmndJqT9G0yDfZsjd+Gkw50syK3Yh/BQAPU= 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 1594397968173694.6995489826443; Fri, 10 Jul 2020 09:19:28 -0700 (PDT) Received: from localhost ([::1]:36406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtvkE-0003Ag-Vj for importer@patchew.org; Fri, 10 Jul 2020 12:19:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtvfM-000318-Tt; Fri, 10 Jul 2020 12:14:24 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:43651) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jtvfI-0004vP-JX; Fri, 10 Jul 2020 12:14:24 -0400 Received: from [81.0.43.0] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jtvea-0003je-AM; Fri, 10 Jul 2020 18:13:36 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jtveK-0001QX-Td; Fri, 10 Jul 2020 18:13:20 +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=quDPSlunrrCmsJvyut+Ssrzu4WgMw45eo+aNiowNwG0=; b=oyoa3OcKSLHoct4uePi7DcS+JRfdv/P8acu/lGopmUwTnPa8mdLEpZpNJTEI2tkJWZakwq95PuRIK4xB/IPec2j7nJCz0Sp54rj/wcsKHVfRRlD2HTKvn/hJ7pI2ogyLcxHh1ORyH7yJN8muENoyzFcjHLscHq2CU8ctA3tsq6h8H6p4gi9VsF/1vkErapAPmsUucSIKDc4a/espgrhWnZ1biRPj6X3SwnRYh0pi9KxFYhbttTVIdWkymgg3tiZi2bRm0aXM+bV8vrVUX0Xn++kUo9wqFniR5ChsbbTF24J5a9SzoDCvPiOBJV7rY1XxMhb20wjKqlaJuQ2kDIz4Zg==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v11 11/34] qcow2: Add offset_into_subcluster() and size_to_subclusters() Date: Fri, 10 Jul 2020 18:12:53 +0200 Message-Id: <3cc2390dcdef3d234d47c741b708bd8734490862.1594396418.git.berto@igalia.com> 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/07/10 12:13:35 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_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no 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, Derek Su , 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 Reviewed-by: Max Reitz --- block/qcow2.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/qcow2.h b/block/qcow2.h index 2503374677..4fe31adfd3 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -555,11 +555,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