[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 33/34] qcow2: Assert that expand_zero_clusters_in_l1() does no
From: |
Alberto Garcia |
Subject: |
[PATCH v8 33/34] qcow2: Assert that expand_zero_clusters_in_l1() does not support subclusters |
Date: |
Wed, 10 Jun 2020 17:03:11 +0200 |
This function is only used by qcow2_expand_zero_clusters() to
downgrade a qcow2 image to a previous version. It is however not
possible to downgrade an image with extended L2 entries because older
versions of qcow2 do not have this feature.
Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
block/qcow2-cluster.c | 8 +++++++-
tests/qemu-iotests/061 | 6 ++++++
tests/qemu-iotests/061.out | 5 +++++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index c8217081f2..e8bb1f32f3 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -2157,6 +2157,9 @@ static int expand_zero_clusters_in_l1(BlockDriverState
*bs, uint64_t *l1_table,
int ret;
int i, j;
+ /* qcow2_downgrade() is not allowed in images with subclusters */
+ assert(!has_subclusters(s));
+
slice_size2 = s->l2_slice_size * l2_entry_size(s);
n_slices = s->cluster_size / slice_size2;
@@ -2225,7 +2228,8 @@ static int expand_zero_clusters_in_l1(BlockDriverState
*bs, uint64_t *l1_table,
if (cluster_type == QCOW2_CLUSTER_ZERO_PLAIN) {
if (!bs->backing) {
/* not backed; therefore we can simply deallocate the
- * cluster */
+ * cluster. No need to call set_l2_bitmap(), this
+ * function doesn't support images with subclusters. */
set_l2_entry(s, l2_slice, j, 0);
l2_dirty = true;
continue;
@@ -2296,6 +2300,8 @@ static int expand_zero_clusters_in_l1(BlockDriverState
*bs, uint64_t *l1_table,
} else {
set_l2_entry(s, l2_slice, j, offset);
}
+ /* No need to call set_l2_bitmap() after set_l2_entry() because
+ * this function doesn't support images with subclusters. */
l2_dirty = true;
}
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index 10eb243164..23add2dfe3 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -303,6 +303,12 @@ $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
_img_info --format-specific
_check_test_img
+echo
+echo "=== Testing version downgrade with extended L2 entries ==="
+echo
+_make_test_img -o "compat=1.1,extended_l2=on" 64M
+$QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
+
echo
echo "=== Try changing the external data file ==="
echo
diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
index 39812d8cf8..c1acdbd751 100644
--- a/tests/qemu-iotests/061.out
+++ b/tests/qemu-iotests/061.out
@@ -528,6 +528,11 @@ Format specific information:
extended l2: false
No errors were found on the image.
+=== Testing version downgrade with extended L2 entries ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+qemu-img: Cannot downgrade an image with incompatible features 0x10 set
+
=== Try changing the external data file ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
--
2.20.1
- [PATCH v8 10/34] qcow2: Add offset_to_sc_index(), (continued)
- [PATCH v8 10/34] qcow2: Add offset_to_sc_index(), Alberto Garcia, 2020/06/10
- [PATCH v8 19/34] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC, Alberto Garcia, 2020/06/10
- [PATCH v8 07/34] qcow2: Document the Extended L2 Entries feature, Alberto Garcia, 2020/06/10
- [PATCH v8 02/34] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset(), Alberto Garcia, 2020/06/10
- [PATCH v8 29/34] qcow2: Add subcluster support to qcow2_measure(), Alberto Garcia, 2020/06/10
- [PATCH v8 23/34] qcow2: Add subcluster support to discard_in_l2_slice(), Alberto Garcia, 2020/06/10
- [PATCH v8 09/34] qcow2: Add subcluster-related fields to BDRVQcow2State, Alberto Garcia, 2020/06/10
- [PATCH v8 32/34] qcow2: Allow preallocation and backing files if extended_l2 is set, Alberto Garcia, 2020/06/10
- [PATCH v8 05/34] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied(), Alberto Garcia, 2020/06/10
- [PATCH v8 33/34] qcow2: Assert that expand_zero_clusters_in_l1() does not support subclusters,
Alberto Garcia <=
- [PATCH v8 14/34] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type(), Alberto Garcia, 2020/06/10
- [PATCH v8 31/34] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit, Alberto Garcia, 2020/06/10
- [PATCH v8 21/34] qcow2: Add subcluster support to qcow2_get_host_offset(), Alberto Garcia, 2020/06/10
- [PATCH v8 30/34] qcow2: Add prealloc field to QCowL2Meta, Alberto Garcia, 2020/06/10
- [PATCH v8 27/34] qcow2: Add subcluster support to handle_alloc_space(), Alberto Garcia, 2020/06/10
- [PATCH v8 25/34] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2020/06/10