|
 |
9ae3a8 |
From cda3f47a339a8836037c0c88cd3cb4ac7c299211 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 9 Sep 2013 14:27:54 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 03/38] block: package committing code in qmp_transaction()
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1378736903-18489-4-git-send-email-kwolf@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 54190
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 03/32] block: package committing 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 |
The code is simply moved into a separate function.
|
|
|
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 3b0047e86a1c215d830b1ae1da0778db4636b83a)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
blockdev.c | 19 ++++++++++++-------
|
|
|
9ae3a8 |
1 file changed, 12 insertions(+), 7 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
blockdev.c | 19 ++++++++++++-------
|
|
|
9ae3a8 |
1 files changed, 12 insertions(+), 7 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/blockdev.c b/blockdev.c
|
|
|
9ae3a8 |
index 9eab803..eabb3f8 100644
|
|
|
9ae3a8 |
--- a/blockdev.c
|
|
|
9ae3a8 |
+++ b/blockdev.c
|
|
|
9ae3a8 |
@@ -871,6 +871,17 @@ static void external_snapshot_prepare(BlockdevAction *action,
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+static void external_snapshot_commit(BlkTransactionStates *states)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ /* This removes our old bs from the bdrv_states, and adds the new bs */
|
|
|
9ae3a8 |
+ bdrv_append(states->new_bs, states->old_bs);
|
|
|
9ae3a8 |
+ /* We don't need (or want) to use the transactional
|
|
|
9ae3a8 |
+ * bdrv_reopen_multiple() across all the entries at once, because we
|
|
|
9ae3a8 |
+ * don't want to abort all of them if one of them fails the reopen */
|
|
|
9ae3a8 |
+ bdrv_reopen(states->new_bs, states->new_bs->open_flags & ~BDRV_O_RDWR,
|
|
|
9ae3a8 |
+ NULL);
|
|
|
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 |
@@ -916,13 +927,7 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)
|
|
|
9ae3a8 |
/* Now we are going to do the actual pivot. Everything up to this point
|
|
|
9ae3a8 |
* is reversible, but we are committed at this point */
|
|
|
9ae3a8 |
QSIMPLEQ_FOREACH(states, &snap_bdrv_states, entry) {
|
|
|
9ae3a8 |
- /* This removes our old bs from the bdrv_states, and adds the new bs */
|
|
|
9ae3a8 |
- bdrv_append(states->new_bs, states->old_bs);
|
|
|
9ae3a8 |
- /* We don't need (or want) to use the transactional
|
|
|
9ae3a8 |
- * bdrv_reopen_multiple() across all the entries at once, because we
|
|
|
9ae3a8 |
- * don't want to abort all of them if one of them fails the reopen */
|
|
|
9ae3a8 |
- bdrv_reopen(states->new_bs, states->new_bs->open_flags & ~BDRV_O_RDWR,
|
|
|
9ae3a8 |
- NULL);
|
|
|
9ae3a8 |
+ external_snapshot_commit(states);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* success */
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|