[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V5 4/6] qcow2: cancel the modification on fail in qc
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V5 4/6] qcow2: cancel the modification on fail in qcow2_snapshot_create() |
Date: |
Tue, 5 Nov 2013 08:01:27 +0800 |
Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/qcow2-snapshot.c | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 70e329e..685ef8b 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -400,6 +400,7 @@ void qcow2_snapshot_create(BlockDriverState *bs,
int i, ret;
uint64_t *l1_table = NULL;
int64_t l1_table_offset;
+ Error *err = NULL;
memset(sn, 0, sizeof(*sn));
@@ -448,7 +449,7 @@ void qcow2_snapshot_create(BlockDriverState *bs,
PRIu64 " with size %" PRIu64,
sn->l1_table_offset,
(uint64_t)(s->l1_size * sizeof(uint64_t)));
- goto fail;
+ goto dealloc_cluster;
}
ret = bdrv_pwrite(bs->file, sn->l1_table_offset, l1_table,
@@ -459,7 +460,7 @@ void qcow2_snapshot_create(BlockDriverState *bs,
PRIu64 " with size %" PRIu64,
sn->l1_table_offset,
(uint64_t)(s->l1_size * sizeof(uint64_t)));
- goto fail;
+ goto dealloc_cluster;
}
g_free(l1_table);
@@ -476,7 +477,7 @@ void qcow2_snapshot_create(BlockDriverState *bs,
"Failed in update of refcount for snapshot at %"
PRIu64 " with size %d",
s->l1_table_offset, s->l1_size);
- goto fail;
+ goto dealloc_cluster;
}
/* Append the new snapshot to the snapshot list */
@@ -494,7 +495,7 @@ void qcow2_snapshot_create(BlockDriverState *bs,
g_free(s->snapshots);
s->snapshots = old_snapshot_list;
s->nb_snapshots--;
- goto fail;
+ goto restore_refcount;
}
g_free(old_snapshot_list);
@@ -514,6 +515,22 @@ void qcow2_snapshot_create(BlockDriverState *bs,
#endif
return;
+restore_refcount:
+ if (qcow2_update_snapshot_refcount(bs, s->l1_table_offset, s->l1_size, -1)
+ < 0 && errp) {
+ /* Nothing can be done now, need image check later */
+ error_setg(&err, "%s\nqcow2: Error in restoring refcount in snapshot",
+ error_get_pretty(*errp));
+ error_free(*errp);
+ *errp = NULL;
+ error_propagate(errp, err);
+ }
+
+dealloc_cluster:
+ qcow2_free_clusters(bs, sn->l1_table_offset,
+ sn->l1_size * sizeof(uint64_t),
+ QCOW2_DISCARD_ALWAYS);
+
fail:
g_free(sn->id_str);
g_free(sn->name);
--
1.7.1
- [Qemu-devel] [PATCH V5 0/6] qcow2: rollback the modification on fail in snapshot creation, Wenchao Xia, 2013/11/05
- [Qemu-devel] [PATCH V5 3/6] qcow2: do not free clusters when fail in header update in qcow2_write_snapshots, Wenchao Xia, 2013/11/05
- [Qemu-devel] [PATCH V5 6/6] qemu-iotests: add test for qcow2 snapshot, Wenchao Xia, 2013/11/05
- [Qemu-devel] [PATCH V5 4/6] qcow2: cancel the modification on fail in qcow2_snapshot_create(),
Wenchao Xia <=
- [Qemu-devel] [PATCH V5 2/6] qcow2: add error message in qcow2_write_snapshots(), Wenchao Xia, 2013/11/05
- [Qemu-devel] [PATCH V5 1/6] snapshot: add parameter *errp in snapshot create, Wenchao Xia, 2013/11/05
- [Qemu-devel] [PATCH V5 5/6] blkdebug: add debug events for snapshot, Wenchao Xia, 2013/11/05