yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-block-package-rollback-code-in-qmp_transaction.patch

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