qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PULL 11/34] qcow2: Add offset_into_subcluster() and size_to_subclusters()
Date: Tue, 25 Aug 2020 10:32:48 +0200	[thread overview]
Message-ID: <20200825083311.1098442-12-mreitz@redhat.com> (raw)
In-Reply-To: <20200825083311.1098442-1-mreitz@redhat.com>

From: Alberto Garcia <berto@igalia.com>

Like offset_into_cluster() and size_to_clusters(), but for
subclusters.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <3cc2390dcdef3d234d47c741b708bd8734490862.1594396418.git.berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 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(BDRVQcow2State *s, int64_t offset)
     return offset & (s->cluster_size - 1);
 }
 
+static inline int64_t offset_into_subcluster(BDRVQcow2State *s, int64_t offset)
+{
+    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;
 }
 
+static inline uint64_t size_to_subclusters(BDRVQcow2State *s, uint64_t size)
+{
+    return (size + (s->subcluster_size - 1)) >> s->subcluster_bits;
+}
+
 static inline int64_t size_to_l1(BDRVQcow2State *s, int64_t size)
 {
     int shift = s->cluster_bits + s->l2_bits;
-- 
2.26.2



  parent reply	other threads:[~2020-08-25  8:42 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-25  8:32 [PULL 00/34] Block patches Max Reitz
2020-08-25  8:32 ` [PULL 01/34] qcow2: Make Qcow2AioTask store the full host offset Max Reitz
2020-08-25  8:32 ` [PULL 02/34] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset() Max Reitz
2020-08-25  8:32 ` [PULL 03/34] qcow2: Add calculate_l2_meta() Max Reitz
2020-08-25  8:32 ` [PULL 04/34] qcow2: Split cluster_needs_cow() out of count_cow_clusters() Max Reitz
2020-08-25  8:32 ` [PULL 05/34] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied() Max Reitz
2020-08-25  8:32 ` [PULL 06/34] qcow2: Add get_l2_entry() and set_l2_entry() Max Reitz
2020-08-25  8:32 ` [PULL 07/34] qcow2: Document the Extended L2 Entries feature Max Reitz
2020-08-25  8:32 ` [PULL 08/34] qcow2: Add dummy has_subclusters() function Max Reitz
2020-08-25  8:32 ` [PULL 09/34] qcow2: Add subcluster-related fields to BDRVQcow2State Max Reitz
2020-08-25  8:32 ` [PULL 10/34] qcow2: Add offset_to_sc_index() Max Reitz
2020-08-25  8:32 ` Max Reitz [this message]
2020-08-25  8:32 ` [PULL 12/34] qcow2: Add l2_entry_size() Max Reitz
2020-08-25  8:32 ` [PULL 13/34] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap() Max Reitz
2020-08-25  8:32 ` [PULL 14/34] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type() Max Reitz
2020-08-25  8:32 ` [PULL 15/34] qcow2: Add qcow2_get_subcluster_range_type() Max Reitz
2020-08-25  8:32 ` [PULL 16/34] qcow2: Add qcow2_cluster_is_allocated() Max Reitz
2020-08-25  8:32 ` [PULL 17/34] qcow2: Add cluster type parameter to qcow2_get_host_offset() Max Reitz
2020-08-25  8:32 ` [PULL 18/34] qcow2: Replace QCOW2_CLUSTER_* with QCOW2_SUBCLUSTER_* Max Reitz
2020-08-25  8:32 ` [PULL 19/34] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC Max Reitz
2020-08-25  8:32 ` [PULL 20/34] qcow2: Add subcluster support to calculate_l2_meta() Max Reitz
2020-08-25  8:32 ` [PULL 21/34] qcow2: Add subcluster support to qcow2_get_host_offset() Max Reitz
2020-08-25  8:32 ` [PULL 22/34] qcow2: Add subcluster support to zero_in_l2_slice() Max Reitz
2020-08-25  8:33 ` [PULL 23/34] qcow2: Add subcluster support to discard_in_l2_slice() Max Reitz
2020-08-25  8:33 ` [PULL 24/34] qcow2: Add subcluster support to check_refcounts_l2() Max Reitz
2020-08-25  8:33 ` [PULL 25/34] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2() Max Reitz
2020-08-25  8:33 ` [PULL 26/34] qcow2: Clear the L2 bitmap when allocating a compressed cluster Max Reitz
2020-08-25  8:33 ` [PULL 27/34] qcow2: Add subcluster support to handle_alloc_space() Max Reitz
2020-08-25  8:33 ` [PULL 28/34] qcow2: Add subcluster support to qcow2_co_pwrite_zeroes() Max Reitz
2020-08-25  8:33 ` [PULL 29/34] qcow2: Add subcluster support to qcow2_measure() Max Reitz
2020-08-25  8:33 ` [PULL 30/34] qcow2: Add prealloc field to QCowL2Meta Max Reitz
2020-08-25  8:33 ` [PULL 31/34] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit Max Reitz
2020-08-25  8:33 ` [PULL 32/34] qcow2: Allow preallocation and backing files if extended_l2 is set Max Reitz
2020-08-25  8:33 ` [PULL 33/34] qcow2: Assert that expand_zero_clusters_in_l1() does not support subclusters Max Reitz
2020-08-25  8:33 ` [PULL 34/34] iotests: Add tests for qcow2 images with extended L2 entries Max Reitz
2020-08-25 14:01 ` [PULL 00/34] Block patches Peter Maydell
2020-08-25 14:22   ` Alberto Garcia
2020-08-25 15:13     ` Max Reitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200825083311.1098442-12-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).