From patchwork Tue May 10 02:50:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 9053151 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4F0A09F1C3 for ; Tue, 10 May 2016 02:52:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3CF720148 for ; Tue, 10 May 2016 02:52:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8AEA720145 for ; Tue, 10 May 2016 02:52:04 +0000 (UTC) Received: from localhost ([::1]:44059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azxmF-0000xk-Jd for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 May 2016 22:52:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azxls-0000fV-Pd for qemu-devel@nongnu.org; Mon, 09 May 2016 22:51:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1azxlr-0004YH-Df for qemu-devel@nongnu.org; Mon, 09 May 2016 22:51:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41117) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azxlj-0004Vi-NR; Mon, 09 May 2016 22:51:31 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3292C61A0C; Tue, 10 May 2016 02:51:31 +0000 (UTC) Received: from ad.usersys.redhat.com (dhcp-15-133.nay.redhat.com [10.66.15.133]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4A2ovUs023061; Mon, 9 May 2016 22:51:27 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 10 May 2016 10:50:39 +0800 Message-Id: <1462848659-28659-8-git-send-email-famz@redhat.com> In-Reply-To: <1462848659-28659-1-git-send-email-famz@redhat.com> References: <1462848659-28659-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 10 May 2016 02:51:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 07/27] block: Handle image locking during reopen X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, rjones@redhat.com, John Snow , Jeff Cody , Markus Armbruster , Max Reitz , stefanha@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Stash the locking state into BDRVReopenState. If it was locked, unlock in prepare, and lock it again when commit or abort. Signed-off-by: Fam Zheng --- block.c | 11 +++++++++++ include/block/block.h | 1 + 2 files changed, 12 insertions(+) diff --git a/block.c b/block.c index 3f5369a..1b3aac4 100644 --- a/block.c +++ b/block.c @@ -2113,6 +2113,11 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, } while ((entry = qdict_next(reopen_state->options, entry))); } + reopen_state->was_locked = reopen_state->bs->image_locked; + if (reopen_state->was_locked) { + bdrv_unlock_image(reopen_state->bs); + } + ret = 0; error: @@ -2137,6 +2142,9 @@ static void bdrv_reopen_commit(BDRVReopenState *reopen_state) if (drv->bdrv_reopen_commit) { drv->bdrv_reopen_commit(reopen_state); } + if (reopen_state->was_locked) { + bdrv_lock_image(reopen_state->bs); + } /* set BDS specific flags now */ QDECREF(reopen_state->bs->explicit_options); @@ -2163,6 +2171,9 @@ static void bdrv_reopen_abort(BDRVReopenState *reopen_state) if (drv->bdrv_reopen_abort) { drv->bdrv_reopen_abort(reopen_state); } + if (reopen_state->was_locked) { + bdrv_lock_image(reopen_state->bs); + } QDECREF(reopen_state->explicit_options); } diff --git a/include/block/block.h b/include/block/block.h index d240a03..7839f69 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -157,6 +157,7 @@ typedef struct BDRVReopenState { QDict *options; QDict *explicit_options; void *opaque; + bool was_locked; } BDRVReopenState; /*