From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsSyH-0004oX-QN for qemu-devel@nongnu.org; Wed, 13 May 2015 05:28:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsSyG-0001op-T0 for qemu-devel@nongnu.org; Wed, 13 May 2015 05:28:57 -0400 From: Fam Zheng Date: Wed, 13 May 2015 17:28:15 +0000 Message-Id: <1431538099-3286-8-git-send-email-famz@redhat.com> In-Reply-To: <1431538099-3286-1-git-send-email-famz@redhat.com> References: <1431538099-3286-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 07/11] blockdev: Block device IO during internal snapshot transaction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, jcody@redhat.com, armbru@redhat.com, mreitz@redhat.com, Stefan Hajnoczi , pbonzini@redhat.com Signed-off-by: Fam Zheng --- 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