From patchwork Wed Sep 2 08:51:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 513402 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 26A6714028F for ; Wed, 2 Sep 2015 18:53:06 +1000 (AEST) Received: from localhost ([::1]:35261 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX3mv-0000Xo-3L for incoming@patchwork.ozlabs.org; Wed, 02 Sep 2015 04:53:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX3m2-0007VG-RT for qemu-devel@nongnu.org; Wed, 02 Sep 2015 04:52:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZX3m1-0004Rw-9b for qemu-devel@nongnu.org; Wed, 02 Sep 2015 04:52:06 -0400 Received: from [59.151.112.132] (port=2317 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX3m0-0004EK-K0; Wed, 02 Sep 2015 04:52:05 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="100276463" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 02 Sep 2015 16:54:58 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t828pjdU020268; Wed, 2 Sep 2015 16:51:45 +0800 Received: from G08FNSTD140052.g08.fujitsu.local (10.167.226.52) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 2 Sep 2015 16:51:54 +0800 From: Wen Congyang To: qemu devel , Fam Zheng , Max Reitz , Paolo Bonzini , Stefan Hajnoczi Date: Wed, 2 Sep 2015 16:51:06 +0800 Message-ID: <1441183880-26993-3-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1441183880-26993-1-git-send-email-wency@cn.fujitsu.com> References: <1441183880-26993-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.52] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Kevin Wolf , qemu block , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , "Michael R. Hines" , Yang Hongyang Subject: [Qemu-devel] [PATCH 02/16] introduce a new API to check if blk is attached 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 Signed-off-by: Wen Congyang --- block.c | 4 ++-- block/block-backend.c | 9 +++++++++ include/sysemu/block-backend.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 0f9029b..aeb365b 100644 --- a/block.c +++ b/block.c @@ -2089,7 +2089,7 @@ void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old) } /* bs_new must be unattached and shouldn't have anything fancy enabled */ - assert(!bs_new->blk); + assert(!blk_is_attached(bs_new->blk)); assert(QLIST_EMPTY(&bs_new->dirty_bitmaps)); assert(bs_new->job == NULL); assert(bs_new->io_limits_enabled == false); @@ -2106,7 +2106,7 @@ void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old) bdrv_move_feature_fields(bs_new, &tmp); /* bs_new must remain unattached */ - assert(!bs_new->blk); + assert(!blk_is_attached(bs_new->blk)); /* Check a few fields that should remain attached to the device */ assert(bs_new->job == NULL); diff --git a/block/block-backend.c b/block/block-backend.c index 72d8b2c..1463c37 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -368,6 +368,15 @@ void blk_enable_attach_dev(BlockBackend *blk) } /* + * Return true if a device model is attached to @blk already, + * otherwise, return false. + */ +bool blk_is_attached(BlockBackend *blk) +{ + return blk != NULL && blk->dev != NULL && blk->dev != (void *)-1; +} + +/* * Set @blk's device model callbacks to @ops. * @opaque is the opaque argument to pass to the callbacks. * This is for use by device models. diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 7619a9f..a8c6fd2 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -82,6 +82,7 @@ void blk_detach_dev(BlockBackend *blk, void *dev); void *blk_get_attached_dev(BlockBackend *blk); int blk_disable_attach_dev(BlockBackend *blk); void blk_enable_attach_dev(BlockBackend *blk); +bool blk_is_attached(BlockBackend *blk); void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps *ops, void *opaque); int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf, int nb_sectors);