From: Alberto Garcia <berto@igalia.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Alberto Garcia <berto@igalia.com>,
qemu-block@nongnu.org, Derek Su <dereksu@qnap.com>,
Max Reitz <mreitz@redhat.com>
Subject: [PATCH v6 09/32] qcow2: Add subcluster-related fields to BDRVQcow2State
Date: Sun, 24 May 2020 16:51:29 +0200 [thread overview]
Message-ID: <fbffb90925bb8000896e818efc0b8a3ef0f62519.1590331741.git.berto@igalia.com> (raw)
In-Reply-To: <cover.1590331741.git.berto@igalia.com>
This patch adds the following new fields to BDRVQcow2State:
- subclusters_per_cluster: Number of subclusters in a cluster
- subcluster_size: The size of each subcluster, in bytes
- subcluster_bits: No. of bits so 1 << subcluster_bits = subcluster_size
Images without subclusters are treated as if they had exactly one
subcluster per cluster (i.e. subcluster_size = cluster_size).
Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/qcow2.h | 5 +++++
block/qcow2.c | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/block/qcow2.h b/block/qcow2.h
index f41bfd743f..4e9c732831 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -78,6 +78,8 @@
/* The cluster reads as all zeros */
#define QCOW_OFLAG_ZERO (1ULL << 0)
+#define QCOW_EXTL2_SUBCLUSTERS_PER_CLUSTER 32
+
#define MIN_CLUSTER_BITS 9
#define MAX_CLUSTER_BITS 21
@@ -295,6 +297,9 @@ typedef struct BDRVQcow2State {
int cluster_bits;
int cluster_size;
int l2_slice_size;
+ int subcluster_bits;
+ int subcluster_size;
+ int subclusters_per_cluster;
int l2_bits;
int l2_size;
int l1_size;
diff --git a/block/qcow2.c b/block/qcow2.c
index 6562eb1590..916b6c3f92 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1433,6 +1433,11 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
}
}
+ s->subclusters_per_cluster =
+ has_subclusters(s) ? QCOW_EXTL2_SUBCLUSTERS_PER_CLUSTER : 1;
+ s->subcluster_size = s->cluster_size / s->subclusters_per_cluster;
+ s->subcluster_bits = ctz32(s->subcluster_size);
+
/* Check support for various header values */
if (header.refcount_order > 6) {
error_setg(errp, "Reference count entry width too large; may not "
--
2.20.1
next prev parent reply other threads:[~2020-05-24 14:57 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-24 14:51 [PATCH v6 00/32] Add subcluster allocation to qcow2 Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 01/32] qcow2: Make Qcow2AioTask store the full host offset Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 02/32] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 03/32] qcow2: Add calculate_l2_meta() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 04/32] qcow2: Split cluster_needs_cow() out of count_cow_clusters() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 05/32] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 06/32] qcow2: Add get_l2_entry() and set_l2_entry() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 07/32] qcow2: Document the Extended L2 Entries feature Alberto Garcia
2020-05-26 19:54 ` Eric Blake
2020-05-24 14:51 ` [PATCH v6 08/32] qcow2: Add dummy has_subclusters() function Alberto Garcia
2020-05-24 14:51 ` Alberto Garcia [this message]
2020-05-24 14:51 ` [PATCH v6 10/32] qcow2: Add offset_to_sc_index() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 11/32] qcow2: Add offset_into_subcluster() and size_to_subclusters() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 12/32] qcow2: Add l2_entry_size() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 13/32] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 14/32] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 15/32] qcow2: Add qcow2_get_subcluster_range_type() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 16/32] qcow2: Add qcow2_cluster_is_allocated() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 17/32] qcow2: Add cluster type parameter to qcow2_get_host_offset() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 18/32] qcow2: Replace QCOW2_CLUSTER_* with QCOW2_SUBCLUSTER_* Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 19/32] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 20/32] qcow2: Add subcluster support to calculate_l2_meta() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 21/32] qcow2: Add subcluster support to qcow2_get_host_offset() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 22/32] qcow2: Add subcluster support to zero_in_l2_slice() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 23/32] qcow2: Add subcluster support to discard_in_l2_slice() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 24/32] qcow2: Add subcluster support to check_refcounts_l2() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 25/32] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 26/32] qcow2: Clear the L2 bitmap when allocating a compressed cluster Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 27/32] qcow2: Add subcluster support to handle_alloc_space() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 28/32] qcow2: Add subcluster support to qcow2_co_pwrite_zeroes() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 29/32] qcow2: Add subcluster support to qcow2_measure() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 30/32] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 31/32] qcow2: Assert that expand_zero_clusters_in_l1() does not support subclusters Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 32/32] iotests: Add tests for qcow2 images with extended L2 entries Alberto Garcia
2020-05-24 16:29 ` [PATCH v6 00/32] Add subcluster allocation to qcow2 no-reply
2020-05-24 16:34 ` no-reply
2020-05-25 16:06 ` Alberto Garcia
2020-05-24 16:42 ` no-reply
2020-05-24 16:46 ` no-reply
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=fbffb90925bb8000896e818efc0b8a3ef0f62519.1590331741.git.berto@igalia.com \
--to=berto@igalia.com \
--cc=dereksu@qnap.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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).