[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V5 4/5] block: package rollback code in qmp_transact
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V5 4/5] block: package rollback code in qmp_transaction() |
Date: |
Wed, 8 May 2013 18:25:15 +0800 |
Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
blockdev.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 76f0532..2131e13 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -882,6 +882,13 @@ static void external_snapshot_commit(BlkTransactionStates
*states)
NULL);
}
+static void external_snapshot_abort(BlkTransactionStates *states)
+{
+ if (states->new_bs) {
+ bdrv_delete(states->new_bs);
+ }
+}
+
/*
* 'Atomic' group snapshots. The snapshots are taken as a set, and if any fail
* then we do not pivot any of the devices in the group, and abandon the
@@ -939,9 +946,7 @@ delete_and_fail:
* the original bs for all images
*/
QSIMPLEQ_FOREACH(states, &snap_bdrv_states, entry) {
- if (states->new_bs) {
- bdrv_delete(states->new_bs);
- }
+ external_snapshot_abort(states);
}
exit:
QSIMPLEQ_FOREACH_SAFE(states, &snap_bdrv_states, entry, next) {
--
1.7.1
- [Qemu-devel] [PATCH V5 0/5] block: make qmp_transaction extendable, Wenchao Xia, 2013/05/08
- [Qemu-devel] [PATCH V5 1/5] block: package preparation code in qmp_transaction(), Wenchao Xia, 2013/05/08
- [Qemu-devel] [PATCH V5 3/5] block: package committing code in qmp_transaction(), Wenchao Xia, 2013/05/08
- [Qemu-devel] [PATCH V5 2/5] block: move input parsing code in qmp_transaction(), Wenchao Xia, 2013/05/08
- [Qemu-devel] [PATCH V5 4/5] block: package rollback code in qmp_transaction(),
Wenchao Xia <=
- [Qemu-devel] [PATCH V5 5/5] block: make all steps in qmp_transaction() as callback, Wenchao Xia, 2013/05/08
- Re: [Qemu-devel] [PATCH V5 0/5] block: make qmp_transaction extendable, Kevin Wolf, 2013/05/08