From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuYdv-0007Pz-7a for qemu-devel@nongnu.org; Mon, 18 May 2015 23:56:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YuYdq-0007NZ-9Q for qemu-devel@nongnu.org; Mon, 18 May 2015 23:56:35 -0400 From: Fam Zheng Date: Tue, 19 May 2015 11:49:43 +0000 Message-Id: <1432036186-29903-11-git-send-email-famz@redhat.com> In-Reply-To: <1432036186-29903-1-git-send-email-famz@redhat.com> References: <1432036186-29903-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v4 10/13] blockdev: Block device IO during drive-backup 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, Juan Quintela , Jeff Cody , "Michael S. Tsirkin" , mreitz@redhat.com, Stefan Hajnoczi , Amit Shah , Paolo Bonzini Signed-off-by: Fam Zheng --- blockdev.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c index 923fc90..ae52d27 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1575,6 +1575,7 @@ typedef struct DriveBackupState { BlockDriverState *bs; AioContext *aio_context; BlockJob *job; + Error *blocker; } DriveBackupState; static void drive_backup_prepare(BlkTransactionState *common, Error **errp) @@ -1599,6 +1600,9 @@ static void drive_backup_prepare(BlkTransactionState *common, Error **errp) state->aio_context = bdrv_get_aio_context(bs); aio_context_acquire(state->aio_context); + state->bs = bs; + error_setg(&state->blocker, "drive-backup in progress"); + bdrv_op_block(bs, BLOCK_OP_TYPE_DEVICE_IO, state->blocker); qmp_drive_backup(backup->device, backup->target, backup->has_format, backup->format, backup->sync, @@ -1613,7 +1617,6 @@ static void drive_backup_prepare(BlkTransactionState *common, Error **errp) return; } - state->bs = bs; state->job = state->bs->job; } @@ -1632,6 +1635,10 @@ static void drive_backup_clean(BlkTransactionState *common) { DriveBackupState *state = DO_UPCAST(DriveBackupState, 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.1