From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkQVH-0000Br-M6 for qemu-devel@nongnu.org; Fri, 09 Oct 2015 01:46:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZkQVG-0003E1-Q0 for qemu-devel@nongnu.org; Fri, 09 Oct 2015 01:46:03 -0400 From: Fam Zheng Date: Fri, 9 Oct 2015 13:45:22 +0800 Message-Id: <1444369526-2227-9-git-send-email-famz@redhat.com> In-Reply-To: <1444369526-2227-1-git-send-email-famz@redhat.com> References: <1444369526-2227-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 08/12] block: Add "drained begin/end" for transactional backup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , qemu-block@nongnu.org, Stefan Hajnoczi This ensures the atomicity of the transaction by avoiding processing of external requests such as those from ioeventfd. Move the assignment to state->bs up right after bdrv_drained_begin, so that we can use it in the clean callback. The abort callback will still check bs->job and state->job, so it's OK. Signed-off-by: Fam Zheng --- blockdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c index 90f1e15..232bc21 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1599,6 +1599,8 @@ static void drive_backup_prepare(BlkTransactionState *common, Error **errp) /* AioContext is released in .clean() */ state->aio_context = bdrv_get_aio_context(bs); aio_context_acquire(state->aio_context); + bdrv_drained_begin(bs); + state->bs = bs; qmp_drive_backup(backup->device, backup->target, backup->has_format, backup->format, @@ -1614,7 +1616,6 @@ static void drive_backup_prepare(BlkTransactionState *common, Error **errp) return; } - state->bs = bs; state->job = state->bs->job; } @@ -1634,6 +1635,7 @@ static void drive_backup_clean(BlkTransactionState *common) DriveBackupState *state = DO_UPCAST(DriveBackupState, common, common); if (state->aio_context) { + bdrv_drained_end(state->bs); aio_context_release(state->aio_context); } } -- 2.5.3