[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 07/11] blockdev: Block device IO during internal
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v2 07/11] blockdev: Block device IO during internal snapshot transaction |
Date: |
Wed, 13 May 2015 17:28:15 +0000 |
Signed-off-by: Fam Zheng <address@hidden>
---
blockdev.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 5eaf77e..7f763d9 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1262,6 +1262,7 @@ typedef struct InternalSnapshotState {
BlockDriverState *bs;
AioContext *aio_context;
QEMUSnapshotInfo sn;
+ Error *blocker;
} InternalSnapshotState;
static void internal_snapshot_prepare(BlkTransactionState *common,
@@ -1300,6 +1301,10 @@ static void
internal_snapshot_prepare(BlkTransactionState *common,
state->aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(state->aio_context);
+ state->bs = bs;
+ error_setg(&state->blocker, "internal snapshot in progress");
+ bdrv_op_block(bs, BLOCK_OP_TYPE_DEVICE_IO, state->blocker);
+
if (!bdrv_is_inserted(bs)) {
error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
return;
@@ -1354,9 +1359,6 @@ static void internal_snapshot_prepare(BlkTransactionState
*common,
name, device);
return;
}
-
- /* 4. succeed, mark a snapshot is created */
- state->bs = bs;
}
static void internal_snapshot_abort(BlkTransactionState *common)
@@ -1387,6 +1389,10 @@ static void internal_snapshot_clean(BlkTransactionState
*common)
InternalSnapshotState *state = DO_UPCAST(InternalSnapshotState,
common, common);
+ if (state->bs) {
+ bdrv_op_unblock(state->bs, BLOCK_OP_TYPE_DEVICE_IO, state->blocker);
+ error_free(state->blocker);
+ }
if (state->aio_context) {
aio_context_release(state->aio_context);
}
--
2.4.0
- Re: [Qemu-block] [PATCH v2 01/11] block: Add op blocker type "device IO", (continued)
[Qemu-block] [PATCH v2 03/11] block-backend: Add blk_op_blocker_add_notifier, Fam Zheng, 2015/05/13
[Qemu-block] [PATCH v2 02/11] block: Add op blocker notifier list, Fam Zheng, 2015/05/13
[Qemu-block] [PATCH v2 04/11] virtio-blk: Move complete_request to 'ops' structure, Fam Zheng, 2015/05/13
[Qemu-block] [PATCH v2 05/11] virtio-blk: Don't handle output when there is "device IO" op blocker, Fam Zheng, 2015/05/13
[Qemu-block] [PATCH v2 07/11] blockdev: Block device IO during internal snapshot transaction,
Fam Zheng <=
[Qemu-block] [PATCH v2 06/11] nbd-server: Clear "can_read" when "device io" blocker is set, Fam Zheng, 2015/05/13
[Qemu-block] [PATCH v2 08/11] blockdev: Block device IO during external snapshot transaction, Fam Zheng, 2015/05/13
[Qemu-block] [PATCH v2 09/11] blockdev: Block device IO during drive-backup transaction, Fam Zheng, 2015/05/13
[Qemu-block] [PATCH v2 10/11] blockdev: Block device IO during blockdev-backup transaction, Fam Zheng, 2015/05/13
Re: [Qemu-block] [PATCH v2 10/11] blockdev: Block device IO during blockdev-backup transaction, Paolo Bonzini, 2015/05/13