From patchwork Fri May 29 10:53:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 477799 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0DB19140E6D for ; Fri, 29 May 2015 21:00:54 +1000 (AEST) Received: from localhost ([::1]:35037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyI1z-0000zl-TM for incoming@patchwork.ozlabs.org; Fri, 29 May 2015 07:00:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyHvL-0005Ky-9J for qemu-devel@nongnu.org; Fri, 29 May 2015 06:54:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyHvI-0006xo-2P for qemu-devel@nongnu.org; Fri, 29 May 2015 06:53:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyHvG-0006xQ-AW; Fri, 29 May 2015 06:53:54 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id DCF9ECA638; Fri, 29 May 2015 10:53:53 +0000 (UTC) Received: from cpc-pc.redhat.com (vpn1-4-101.sin2.redhat.com [10.67.4.101]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4TArLx9028288; Fri, 29 May 2015 06:53:50 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 29 May 2015 18:53:19 +0800 Message-Id: <1432896805-23867-7-git-send-email-famz@redhat.com> In-Reply-To: <1432896805-23867-1-git-send-email-famz@redhat.com> References: <1432896805-23867-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , fam@euphon.net, qemu-block@nongnu.org, Jeff Cody , Stefan Hajnoczi , Paolo Bonzini Subject: [Qemu-devel] [RFC PATCH 06/12] blockdev: Lock BDS during blockdev-backup transaction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The change is similar to drive-backup in last patch. Signed-off-by: Fam Zheng --- blockdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c index 517def4..80cf7d5 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1669,6 +1669,8 @@ static void blockdev_backup_prepare(BlkTransactionState *common, Error **errp) return; } aio_context_acquire(state->aio_context); + state->bs = bs; + bdrv_lock(bs); qmp_blockdev_backup(backup->device, backup->target, backup->sync, @@ -1681,7 +1683,6 @@ static void blockdev_backup_prepare(BlkTransactionState *common, Error **errp) return; } - state->bs = bs; state->job = state->bs->job; } @@ -1701,6 +1702,7 @@ static void blockdev_backup_clean(BlkTransactionState *common) BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common); if (state->aio_context) { + bdrv_unlock(state->bs); aio_context_release(state->aio_context); } }