[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 12/19] qcow2: simple case support for downgrading of qcow2 ima
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v5 12/19] qcow2: simple case support for downgrading of qcow2 images with zstd |
Date: |
Thu, 23 Dec 2021 17:01:37 +0100 |
If image doesn't have any compressed cluster we can easily switch to
zlib compression, which may allow to downgrade the image.
That's mostly needed to support IMGOPTS='compression_type=zstd' in some
iotests which do qcow2 downgrade.
While being here also fix checkpatch complain against '#' in printf
formatting.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
block/qcow2.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 56 insertions(+), 2 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index d509016756..c8115e1cba 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -5279,6 +5279,38 @@ static int qcow2_load_vmstate(BlockDriverState *bs,
QEMUIOVector *qiov,
return bs->drv->bdrv_co_preadv_part(bs, offset, qiov->size, qiov, 0, 0);
}
+static int qcow2_has_compressed_clusters(BlockDriverState *bs)
+{
+ int64_t offset = 0;
+ int64_t bytes = bdrv_getlength(bs);
+
+ if (bytes < 0) {
+ return bytes;
+ }
+
+ while (bytes != 0) {
+ int ret;
+ QCow2SubclusterType type;
+ unsigned int cur_bytes = MIN(INT_MAX, bytes);
+ uint64_t host_offset;
+
+ ret = qcow2_get_host_offset(bs, offset, &cur_bytes, &host_offset,
+ &type);
+ if (ret < 0) {
+ return ret;
+ }
+
+ if (type == QCOW2_SUBCLUSTER_COMPRESSED) {
+ return 1;
+ }
+
+ offset += cur_bytes;
+ bytes -= cur_bytes;
+ }
+
+ return 0;
+}
+
/*
* Downgrades an image's version. To achieve this, any incompatible features
* have to be removed.
@@ -5336,9 +5368,10 @@ static int qcow2_downgrade(BlockDriverState *bs, int
target_version,
* the first place; if that happens nonetheless, returning -ENOTSUP is the
* best thing to do anyway */
- if (s->incompatible_features) {
+ if (s->incompatible_features & ~QCOW2_INCOMPAT_COMPRESSION) {
error_setg(errp, "Cannot downgrade an image with incompatible features
"
- "%#" PRIx64 " set", s->incompatible_features);
+ "0x%" PRIx64 " set",
+ s->incompatible_features & ~QCOW2_INCOMPAT_COMPRESSION);
return -ENOTSUP;
}
@@ -5356,6 +5389,27 @@ static int qcow2_downgrade(BlockDriverState *bs, int
target_version,
return ret;
}
+ if (s->incompatible_features & QCOW2_INCOMPAT_COMPRESSION) {
+ ret = qcow2_has_compressed_clusters(bs);
+ if (ret < 0) {
+ error_setg(errp, "Failed to check block status");
+ return -EINVAL;
+ }
+ if (ret) {
+ error_setg(errp, "Cannot downgrade an image with zstd compression "
+ "type and existing compressed clusters");
+ return -ENOTSUP;
+ }
+ /*
+ * No compressed clusters for now, so just chose default zlib
+ * compression.
+ */
+ s->incompatible_features &= ~QCOW2_INCOMPAT_COMPRESSION;
+ s->compression_type = QCOW2_COMPRESSION_TYPE_ZLIB;
+ }
+
+ assert(s->incompatible_features == 0);
+
s->qcow_version = target_version;
ret = qcow2_update_header(bs);
if (ret < 0) {
--
2.31.1
- [PATCH v5 01/19] iotests.py: img_info_log(): rename imgopts argument, (continued)
- [PATCH v5 01/19] iotests.py: img_info_log(): rename imgopts argument, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 04/19] iotests.py: qemu_img*("create"): support IMGOPTS='compression_type=zstd', Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 18/19] iotest 214: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 03/19] iotests: specify some unsupported_imgopts for python iotests, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 05/19] iotests: drop qemu_img_verbose() helper, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 07/19] iotest 303: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 06/19] iotests.py: rewrite default luks support in qemu_img, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 08/19] iotest 065: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 11/19] iotest 302: use img_info_log() helper, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 10/19] iotests.py: filter compression type out, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 12/19] qcow2: simple case support for downgrading of qcow2 images with zstd,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v5 09/19] iotests.py: filter out successful output of qemu-img create, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 13/19] iotests/common.rc: introduce _qcow2_dump_header helper, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 14/19] iotests: massive use _qcow2_dump_header, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 17/19] iotests 60: more accurate set dirty bit in qcow2 header, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 15/19] iotest 39: use _qcow2_dump_header, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 16/19] iotests: bash tests: filter compression type, Vladimir Sementsov-Ogievskiy, 2021/12/23