[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 09/12] block: Add "drained begin/end" for interna
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v6 09/12] block: Add "drained begin/end" for internal snapshot |
Date: |
Thu, 22 Oct 2015 14:32:57 +0800 |
This ensures the atomicity of the transaction by avoiding processing of
external requests such as those from ioeventfd.
state->bs is assigned right after bdrv_drained_begin. Because it was
used as the flag for deletion or not in abort, now we need a separate
flag - InternalSnapshotState.created.
Signed-off-by: Fam Zheng <address@hidden>
---
blockdev.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 52f44b2..adc0e69 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1370,6 +1370,7 @@ typedef struct InternalSnapshotState {
BlockDriverState *bs;
AioContext *aio_context;
QEMUSnapshotInfo sn;
+ bool created;
} InternalSnapshotState;
static void internal_snapshot_prepare(BlkTransactionState *common,
@@ -1414,6 +1415,9 @@ static void internal_snapshot_prepare(BlkTransactionState
*common,
}
bs = blk_bs(blk);
+ state->bs = bs;
+ bdrv_drained_begin(bs);
+
if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT, errp)) {
return;
}
@@ -1465,7 +1469,7 @@ static void internal_snapshot_prepare(BlkTransactionState
*common,
}
/* 4. succeed, mark a snapshot is created */
- state->bs = bs;
+ state->created = true;
}
static void internal_snapshot_abort(BlkTransactionState *common)
@@ -1476,7 +1480,7 @@ static void internal_snapshot_abort(BlkTransactionState
*common)
QEMUSnapshotInfo *sn = &state->sn;
Error *local_error = NULL;
- if (!bs) {
+ if (!state->created) {
return;
}
@@ -1497,6 +1501,7 @@ static void internal_snapshot_clean(BlkTransactionState
*common)
common, common);
if (state->aio_context) {
+ bdrv_drained_end(state->bs);
aio_context_release(state->aio_context);
}
}
--
2.4.3
- [Qemu-devel] [PATCH v6 00/12] block: Protect nested event loop with bdrv_drained_begin and bdrv_drained_end, Fam Zheng, 2015/10/22
- [Qemu-devel] [PATCH v6 02/12] nbd: Mark fd handlers client type as "external", Fam Zheng, 2015/10/22
- [Qemu-devel] [PATCH v6 01/12] aio: Add "is_external" flag for event handlers, Fam Zheng, 2015/10/22
- [Qemu-devel] [PATCH v6 03/12] dataplane: Mark host notifiers' client type as "external", Fam Zheng, 2015/10/22
- [Qemu-devel] [PATCH v6 04/12] aio: introduce aio_{disable, enable}_external, Fam Zheng, 2015/10/22
- [Qemu-devel] [PATCH v6 05/12] block: Introduce "drained begin/end" API, Fam Zheng, 2015/10/22
- [Qemu-devel] [PATCH v6 06/12] block: Add "drained begin/end" for transactional external snapshot, Fam Zheng, 2015/10/22
- [Qemu-devel] [PATCH v6 07/12] block: Add "drained begin/end" for transactional backup, Fam Zheng, 2015/10/22
- [Qemu-devel] [PATCH v6 08/12] block: Add "drained begin/end" for transactional blockdev-backup, Fam Zheng, 2015/10/22
- [Qemu-devel] [PATCH v6 09/12] block: Add "drained begin/end" for internal snapshot,
Fam Zheng <=
- [Qemu-devel] [PATCH v6 10/12] block: Introduce BlockDriver.bdrv_drain callback, Fam Zheng, 2015/10/22
- [Qemu-devel] [PATCH v6 11/12] qed: Implement .bdrv_drain, Fam Zheng, 2015/10/22
- [Qemu-devel] [PATCH v6 12/12] tests: Add test case for aio_disable_external, Fam Zheng, 2015/10/22