[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 08/12] blockdev: Block device IO during external
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v3 08/12] blockdev: Block device IO during external snapshot transaction |
Date: |
Fri, 15 May 2015 14:04:24 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
blockdev.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 7f763d9..923fc90 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1404,6 +1404,7 @@ typedef struct ExternalSnapshotState {
BlockDriverState *old_bs;
BlockDriverState *new_bs;
AioContext *aio_context;
+ Error *blocker;
} ExternalSnapshotState;
static void external_snapshot_prepare(BlkTransactionState *common,
@@ -1525,6 +1526,9 @@ static void external_snapshot_prepare(BlkTransactionState
*common,
if (ret != 0) {
error_propagate(errp, local_err);
}
+
+ error_setg(&state->blocker, "snapshot in progress");
+ bdrv_op_block(state->old_bs, BLOCK_OP_TYPE_DEVICE_IO, state->blocker);
}
static void external_snapshot_commit(BlkTransactionState *common)
@@ -1541,8 +1545,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)
@@ -1552,6 +1554,17 @@ 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->old_bs) {
+ bdrv_op_unblock(state->old_bs, BLOCK_OP_TYPE_DEVICE_IO,
state->blocker);
+ error_free(state->blocker);
+ }
if (state->aio_context) {
aio_context_release(state->aio_context);
}
@@ -1716,6 +1729,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.0
- Re: [Qemu-block] [PATCH v3 01/12] block: Add op blocker type "device IO", (continued)
- [Qemu-block] [PATCH v3 03/12] block-backend: Add blk_op_blocker_add_notifier, Fam Zheng, 2015/05/15
- [Qemu-block] [PATCH v3 06/12] nbd-server: Clear "can_read" when "device io" blocker is set, Fam Zheng, 2015/05/15
- [Qemu-block] [PATCH v3 05/12] virtio-blk: Don't handle output when there is "device IO" op blocker, Fam Zheng, 2015/05/15
- [Qemu-block] [PATCH v3 08/12] blockdev: Block device IO during external snapshot transaction,
Fam Zheng <=
- [Qemu-block] [PATCH v3 07/12] blockdev: Block device IO during internal snapshot transaction, Fam Zheng, 2015/05/15
- [Qemu-block] [PATCH v3 09/12] blockdev: Block device IO during drive-backup transaction, Fam Zheng, 2015/05/15
- [Qemu-block] [PATCH v3 11/12] block: Block "device IO" during bdrv_drain and bdrv_drain_all, Fam Zheng, 2015/05/15
- [Qemu-block] [PATCH v3 10/12] blockdev: Block device IO during blockdev-backup transaction, Fam Zheng, 2015/05/15
- [Qemu-block] [PATCH v3 04/12] virtio-blk: Move complete_request to 'ops' structure, Fam Zheng, 2015/05/15
- [Qemu-block] [PATCH v3 12/12] virtio-scsi-dataplane: Add "device IO" op blocker listener, Fam Zheng, 2015/05/15