From nobody Tue Apr 8 23:36:19 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598344981; cv=none; d=zohomail.com; s=zohoarc; b=Hwoc5R/uFr8VtRMRXNFfl3t3ra+Q8SxQWKbfS4KCAYlWJRFPrJicAI/5DnBsYxwudIY2IUfHy7VN0w83JbQYZHdjxZj7b832KBQXXuGTh/K89GLFdvmwVihyVKVrVE5eT7dQ6zIBAc8T9CL33LHs9qghwvkqDeFEcNadX2P2OGU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598344981; h=Content-Type: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=IF+qIwEj4AnXLg/zSDT7l4rI8v2q2gB0oz0qhKXxhoI=; b=JEdoIgS023eeC4xcQTg98mC7YaR6bp/k2TQLaHRRDq734E0uupwl28uXeNns27U75Uxuz9T4M6928qTWicEHWSYKe/tf31k4QB+l+3YwWcIuDkC8pEE81P9H2aeUTivT3ghgRzW11D8BBBxiMFxz8OtSCleuy3PLE8tW1SaR12E= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598344981780950.8423355095138; Tue, 25 Aug 2020 01:43:01 -0700 (PDT) Received: from localhost ([::1]:54442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAUXi-0005e9-WC for importer@patchew.org; Tue, 25 Aug 2020 04:42:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAUOm-0003dN-NC for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:33:44 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:25164 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAUOl-0000bQ-3m for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:33:44 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-300-ntXjHnpvN3ObuhBSRuBrVg-1; Tue, 25 Aug 2020 04:33:40 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4974818A2250; Tue, 25 Aug 2020 08:33:39 +0000 (UTC) Received: from localhost (ovpn-113-72.ams2.redhat.com [10.36.113.72]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF38819144; Tue, 25 Aug 2020 08:33:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598344422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IF+qIwEj4AnXLg/zSDT7l4rI8v2q2gB0oz0qhKXxhoI=; b=dp+HCNpbpPi+0eExaLqt9Yf0vDObyq9BKHLEX05AJwk4S3xCTa/yqpv35WNOpukxmPGug6 OkF+ZHQNDXeQ8zCpzHMVqXf4S2QLQJ33rW42JM7/y2AAFcxhMQAxM9t8EQOADMlgMq7wsj 2lrJVERrCledg4zfIBsI8Bfo3kMdBjQ= X-MC-Unique: ntXjHnpvN3ObuhBSRuBrVg-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 11/34] qcow2: Add offset_into_subcluster() and size_to_subclusters() Date: Tue, 25 Aug 2020 10:32:48 +0200 Message-Id: <20200825083311.1098442-12-mreitz@redhat.com> In-Reply-To: <20200825083311.1098442-1-mreitz@redhat.com> References: <20200825083311.1098442-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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=205.139.110.61; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:35:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.956, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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 , Peter Maydell , qemu-devel@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" From: Alberto Garcia Like offset_into_cluster() and size_to_clusters(), but for subclusters. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake Reviewed-by: Max Reitz Message-Id: <3cc2390dcdef3d234d47c741b708bd8734490862.1594396418.git.berto@= igalia.com> Signed-off-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.26.2