|
 |
218e99 |
From 615e6e9c2adabbc5039e3fdbd49326eeb549f931 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Date: Mon, 9 Sep 2013 14:27:55 +0200
|
|
|
218e99 |
Subject: [PATCH 04/38] block: package rollback code in qmp_transaction()
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Message-id: <1378736903-18489-5-git-send-email-kwolf@redhat.com>
|
|
|
218e99 |
Patchwork-id: 54191
|
|
|
218e99 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 04/32] block: package rollback code in qmp_transaction()
|
|
|
218e99 |
Bugzilla: 1005818
|
|
|
218e99 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
|
|
|
218e99 |
|
|
|
218e99 |
Bugzilla: 1005818
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
|
|
|
218e99 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
218e99 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
(cherry picked from commit 96b86bf72de0c6eda2799201517ef32910beb340)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
blockdev.c | 11 ++++++++---
|
|
|
218e99 |
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
blockdev.c | 11 ++++++++---
|
|
|
218e99 |
1 files changed, 8 insertions(+), 3 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/blockdev.c b/blockdev.c
|
|
|
218e99 |
index eabb3f8..b040f0f 100644
|
|
|
218e99 |
--- a/blockdev.c
|
|
|
218e99 |
+++ b/blockdev.c
|
|
|
218e99 |
@@ -882,6 +882,13 @@ static void external_snapshot_commit(BlkTransactionStates *states)
|
|
|
218e99 |
NULL);
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
+static void external_snapshot_abort(BlkTransactionStates *states)
|
|
|
218e99 |
+{
|
|
|
218e99 |
+ if (states->new_bs) {
|
|
|
218e99 |
+ bdrv_delete(states->new_bs);
|
|
|
218e99 |
+ }
|
|
|
218e99 |
+}
|
|
|
218e99 |
+
|
|
|
218e99 |
/*
|
|
|
218e99 |
* 'Atomic' group snapshots. The snapshots are taken as a set, and if any fail
|
|
|
218e99 |
* then we do not pivot any of the devices in the group, and abandon the
|
|
|
218e99 |
@@ -939,9 +946,7 @@ delete_and_fail:
|
|
|
218e99 |
* the original bs for all images
|
|
|
218e99 |
*/
|
|
|
218e99 |
QSIMPLEQ_FOREACH(states, &snap_bdrv_states, entry) {
|
|
|
218e99 |
- if (states->new_bs) {
|
|
|
218e99 |
- bdrv_delete(states->new_bs);
|
|
|
218e99 |
- }
|
|
|
218e99 |
+ external_snapshot_abort(states);
|
|
|
218e99 |
}
|
|
|
218e99 |
exit:
|
|
|
218e99 |
QSIMPLEQ_FOREACH_SAFE(states, &snap_bdrv_states, entry, next) {
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|