[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 06/12] block: Add "drained begin/end" for transac
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v3 06/12] block: Add "drained begin/end" for transactional external snapshot |
Date: |
Fri, 16 Oct 2015 18:12:17 +0800 |
This ensures the atomicity of the transaction by avoiding processing of
external requests such as those from ioeventfd.
Signed-off-by: Fam Zheng <address@hidden>
---
blockdev.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 32b04b4..90f1e15 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1479,6 +1479,7 @@ static void external_snapshot_prepare(BlkTransactionState
*common,
/* Acquire AioContext now so any threads operating on old_bs stop */
state->aio_context = bdrv_get_aio_context(state->old_bs);
aio_context_acquire(state->aio_context);
+ bdrv_drained_begin(state->old_bs);
if (!bdrv_is_inserted(state->old_bs)) {
error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
@@ -1548,8 +1549,6 @@ static void external_snapshot_commit(BlkTransactionState
*common)
* don't want to abort all of them if one of them fails the reopen */
bdrv_reopen(state->new_bs, state->new_bs->open_flags & ~BDRV_O_RDWR,
NULL);
-
- aio_context_release(state->aio_context);
}
static void external_snapshot_abort(BlkTransactionState *common)
@@ -1559,7 +1558,14 @@ static void external_snapshot_abort(BlkTransactionState
*common)
if (state->new_bs) {
bdrv_unref(state->new_bs);
}
+}
+
+static void external_snapshot_clean(BlkTransactionState *common)
+{
+ ExternalSnapshotState *state =
+ DO_UPCAST(ExternalSnapshotState, common, common);
if (state->aio_context) {
+ bdrv_drained_end(state->old_bs);
aio_context_release(state->aio_context);
}
}
@@ -1724,6 +1730,7 @@ static const BdrvActionOps actions[] = {
.prepare = external_snapshot_prepare,
.commit = external_snapshot_commit,
.abort = external_snapshot_abort,
+ .clean = external_snapshot_clean,
},
[TRANSACTION_ACTION_KIND_DRIVE_BACKUP] = {
.instance_size = sizeof(DriveBackupState),
--
2.4.3
- [Qemu-block] [PATCH v3 00/12] block: Protect nested event loop with bdrv_drained_begin and bdrv_drained_end, Fam Zheng, 2015/10/16
- [Qemu-block] [PATCH v3 04/12] aio: introduce aio_{disable, enable}_external, Fam Zheng, 2015/10/16
- [Qemu-block] [PATCH v3 05/12] block: Introduce "drained begin/end" API, Fam Zheng, 2015/10/16
- [Qemu-block] [PATCH v3 07/12] block: Add "drained begin/end" for transactional backup, Fam Zheng, 2015/10/16
- [Qemu-block] [PATCH v3 06/12] block: Add "drained begin/end" for transactional external snapshot,
Fam Zheng <=
- [Qemu-block] [PATCH v3 08/12] block: Add "drained begin/end" for transactional blockdev-backup, Fam Zheng, 2015/10/16
- [Qemu-block] [PATCH v3 02/12] nbd: Mark fd handlers client type as "external", Fam Zheng, 2015/10/16
- [Qemu-block] [PATCH v3 01/12] aio: Add "is_external" flag for event handlers, Fam Zheng, 2015/10/16
- [Qemu-block] [PATCH v3 09/12] block: Add "drained begin/end" for internal snapshot, Fam Zheng, 2015/10/16
- [Qemu-block] [PATCH v3 12/12] tests: Add test case for aio_disable_external, Fam Zheng, 2015/10/16
- [Qemu-block] [PATCH v3 10/12] block: Introduce BlockDriver.bdrv_drain callback, Fam Zheng, 2015/10/16
- [Qemu-block] [PATCH v3 11/12] qed: Implement .bdrv_drain, Fam Zheng, 2015/10/16
- [Qemu-block] [PATCH v3 03/12] dataplane: Mark host notifiers' client type as "external", Fam Zheng, 2015/10/16
- Re: [Qemu-block] [Qemu-devel] [PATCH v3 00/12] block: Protect nested event loop with bdrv_drained_begin and bdrv_drained_end, Fam Zheng, 2015/10/18