From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com,
vsementsov@virtuozzo.com, jsnow@redhat.com,
Max Reitz <mreitz@redhat.com>
Subject: [PATCH v3 10/17] qcow2: simple case support for downgrading of qcow2 images with zstd
Date: Tue, 14 Sep 2021 13:25:40 +0300 [thread overview]
Message-ID: <20210914102547.83963-11-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com>
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 9f1b6461c8..a841fa4c72 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -5250,6 +5250,38 @@ static int qcow2_load_vmstate(BlockDriverState *bs, QEMUIOVector *qiov,
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.
@@ -5307,9 +5339,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;
}
@@ -5327,6 +5360,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.29.2
next prev parent reply other threads:[~2021-09-14 10:38 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 10:25 [PATCH v3 00/17] iotests: support zstd Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 01/17] iotests.py: img_info_log(): rename imgopts argument Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 02/17] iotests.py: qemu_img*("create"): support IMGOPTS='compression_type=zstd' Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 03/17] iotests: drop qemu_img_verbose() helper Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 04/17] iotests.py: rewrite default luks support in qemu_img Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 05/17] iotest 303: explicit compression type Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 06/17] iotest 065: " Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 07/17] iotests.py: filter out successful output of qemu-img create Vladimir Sementsov-Ogievskiy
2021-09-14 17:04 ` Hanna Reitz
2021-09-14 10:25 ` [PATCH v3 08/17] iotests.py: filter compression type out Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 09/17] iotest 302: use img_info_log() helper Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` Vladimir Sementsov-Ogievskiy [this message]
2021-09-14 10:25 ` [PATCH v3 11/17] iotests/common.rc: introduce _qcow2_dump_header helper Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 12/17] iotests: massive use _qcow2_dump_header Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 13/17] iotest 39: " Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 14/17] iotests: bash tests: filter compression type Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 15/17] iotests 60: more accurate set dirty bit in qcow2 header Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 16/17] iotest 214: explicit compression type Vladimir Sementsov-Ogievskiy
2021-09-14 10:25 ` [PATCH v3 17/17] iotests: declare lack of support for compresion_type in IMGOPTS Vladimir Sementsov-Ogievskiy
2021-09-14 17:08 ` [PATCH v3 00/17] iotests: support zstd Hanna Reitz
2021-10-07 16:29 ` Vladimir Sementsov-Ogievskiy
2021-10-08 6:39 ` Hanna Reitz
2021-10-08 9:22 ` Vladimir Sementsov-Ogievskiy
2021-09-15 14:45 ` Hanna Reitz
2021-09-17 14:49 ` Hanna Reitz
2021-09-17 18:06 ` Vladimir Sementsov-Ogievskiy
2021-11-02 12:29 ` Kevin Wolf
2021-11-03 13:01 ` Vladimir Sementsov-Ogievskiy
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=20210914102547.83963-11-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--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).