[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/16] qcow2: Write v3-compliant snapshot list on upgrade
From: |
Max Reitz |
Subject: |
[PATCH v3 07/16] qcow2: Write v3-compliant snapshot list on upgrade |
Date: |
Fri, 11 Oct 2019 17:28:05 +0200 |
qcow2 v3 requires every snapshot table entry to have two extra data
fields: The 64-bit VM state size, and the virtual disk size. Both are
optional for v2 images, so they may not be present.
qcow2_upgrade() therefore should update the snapshot table to ensure all
entries have these extra data fields.
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1727347
Reported-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/qcow2.c | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index d43064dca2..a2e46ce589 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -4907,7 +4907,9 @@ static int qcow2_upgrade(BlockDriverState *bs, int
target_version,
Error **errp)
{
BDRVQcow2State *s = bs->opaque;
+ bool need_snapshot_update;
int current_version = s->qcow_version;
+ int i;
int ret;
/* This is qcow2_upgrade(), not qcow2_downgrade() */
@@ -4916,7 +4918,33 @@ static int qcow2_upgrade(BlockDriverState *bs, int
target_version,
/* There are no other versions (yet) that you can upgrade to */
assert(target_version == 3);
- status_cb(bs, 0, 1, cb_opaque);
+ status_cb(bs, 0, 2, cb_opaque);
+
+ /*
+ * In v2, snapshots do not need to have extra data. v3 requires
+ * the 64-bit VM state size and the virtual disk size to be
+ * present.
+ * qcow2_write_snapshots() will always write the list in the
+ * v3-compliant format.
+ */
+ need_snapshot_update = false;
+ for (i = 0; i < s->nb_snapshots; i++) {
+ if (s->snapshots[i].extra_data_size <
+ sizeof_field(QCowSnapshotExtraData, vm_state_size_large) +
+ sizeof_field(QCowSnapshotExtraData, disk_size))
+ {
+ need_snapshot_update = true;
+ break;
+ }
+ }
+ if (need_snapshot_update) {
+ ret = qcow2_write_snapshots(bs);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "Failed to update the snapshot
table");
+ return ret;
+ }
+ }
+ status_cb(bs, 1, 2, cb_opaque);
s->qcow_version = target_version;
ret = qcow2_update_header(bs);
@@ -4925,7 +4953,7 @@ static int qcow2_upgrade(BlockDriverState *bs, int
target_version,
error_setg_errno(errp, -ret, "Failed to update the image header");
return ret;
}
- status_cb(bs, 1, 1, cb_opaque);
+ status_cb(bs, 2, 2, cb_opaque);
return 0;
}
--
2.21.0
- [PATCH v3 00/16] qcow2: Let check -r all repair some snapshot bits, Max Reitz, 2019/10/11
- [PATCH v3 01/16] include: Move endof() up from hw/virtio/virtio.h, Max Reitz, 2019/10/11
- [PATCH v3 02/16] qcow2: Use endof(), Max Reitz, 2019/10/11
- [PATCH v3 03/16] qcow2: Add Error ** to qcow2_read_snapshots(), Max Reitz, 2019/10/11
- [PATCH v3 04/16] qcow2: Keep unknown extra snapshot data, Max Reitz, 2019/10/11
- [PATCH v3 05/16] qcow2: Make qcow2_write_snapshots() public, Max Reitz, 2019/10/11
- [PATCH v3 06/16] qcow2: Put qcow2_upgrade() into its own function, Max Reitz, 2019/10/11
- [PATCH v3 07/16] qcow2: Write v3-compliant snapshot list on upgrade,
Max Reitz <=
[PATCH v3 08/16] qcow2: Separate qcow2_check_read_snapshot_table(), Max Reitz, 2019/10/11
[PATCH v3 09/16] qcow2: Add qcow2_check_fix_snapshot_table(), Max Reitz, 2019/10/11
[PATCH v3 10/16] qcow2: Fix broken snapshot table entries, Max Reitz, 2019/10/11
[PATCH v3 11/16] qcow2: Keep track of the snapshot table length, Max Reitz, 2019/10/11
[PATCH v3 12/16] qcow2: Fix overly long snapshot tables, Max Reitz, 2019/10/11
[PATCH v3 13/16] qcow2: Repair snapshot table with too many entries, Max Reitz, 2019/10/11