[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 16/21] qcow2: Split upgrade/downgrade paths for a
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 16/21] qcow2: Split upgrade/downgrade paths for amend |
Date: |
Fri, 14 Nov 2014 14:06:09 +0100 |
If the image version should be upgraded, that is the first we should do;
if it should be downgraded, that is the last we should do. So split the
version change block into an upgrade part at the start and a downgrade
part at the end.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/qcow2.c | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 423af48..d2553b9 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2726,20 +2726,13 @@ static int qcow2_amend_options(BlockDriverState *bs,
QemuOpts *opts,
desc++;
}
- if (new_version != old_version) {
- if (new_version > old_version) {
- /* Upgrade */
- s->qcow_version = new_version;
- ret = qcow2_update_header(bs);
- if (ret < 0) {
- s->qcow_version = old_version;
- return ret;
- }
- } else {
- ret = qcow2_downgrade(bs, new_version, status_cb, cb_opaque);
- if (ret < 0) {
- return ret;
- }
+ /* Upgrade first (some features may require compat=1.1) */
+ if (new_version > old_version) {
+ s->qcow_version = new_version;
+ ret = qcow2_update_header(bs);
+ if (ret < 0) {
+ s->qcow_version = old_version;
+ return ret;
}
}
@@ -2753,7 +2746,7 @@ static int qcow2_amend_options(BlockDriverState *bs,
QemuOpts *opts,
if (s->use_lazy_refcounts != lazy_refcounts) {
if (lazy_refcounts) {
- if (s->qcow_version < 3) {
+ if (new_version < 3) {
error_report("Lazy refcounts only supported with compatibility
"
"level 1.1 and above (use compat=1.1 or
greater)");
return -EINVAL;
@@ -2789,6 +2782,14 @@ static int qcow2_amend_options(BlockDriverState *bs,
QemuOpts *opts,
}
}
+ /* Downgrade last (so unsupported features can be removed before) */
+ if (new_version < old_version) {
+ ret = qcow2_downgrade(bs, new_version, status_cb, cb_opaque);
+ if (ret < 0) {
+ return ret;
+ }
+ }
+
return 0;
}
--
1.9.3
- Re: [Qemu-devel] [PATCH v2 08/21] qcow2: More helpers for refcount modification, (continued)
- [Qemu-devel] [PATCH v2 09/21] qcow2: Open images with refcount order != 4, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 11/21] iotests: Prepare for refcount_width option, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 12/21] qcow2: Allow creation with refcount order != 4, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 10/21] qcow2: refcount_order parameter for qcow2_create2, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 13/21] block: Add opaque value to the amend CB, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 15/21] qcow2: Use abort() instead of assert(false), Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 16/21] qcow2: Split upgrade/downgrade paths for amend,
Max Reitz <=
- [Qemu-devel] [PATCH v2 14/21] qcow2: Use error_report() in qcow2_amend_options(), Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 17/21] qcow2: Use intermediate helper CB for amend, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 18/21] qcow2: Add function for refcount order amendment, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 19/21] qcow2: Invoke refcount order amendment function, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 20/21] qcow2: Point to amend function in check, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 21/21] iotests: Add test for different refcount widths, Max Reitz, 2014/11/14