From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9mGc-0001gc-Dk for qemu-devel@nongnu.org; Mon, 29 Jun 2015 23:31:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z9mGa-0008Q6-GV for qemu-devel@nongnu.org; Mon, 29 Jun 2015 23:31:26 -0400 From: Wen Congyang Date: Tue, 30 Jun 2015 11:34:35 +0800 Message-ID: <1435635285-5804-8-git-send-email-wency@cn.fujitsu.com> In-Reply-To: <1435635285-5804-1-git-send-email-wency@cn.fujitsu.com> References: <1435635285-5804-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-BLOCK v7 07/17] introduce a new API to check if blk is attached List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu devel , Fam Zheng , Max Reitz , Paolo Bonzini Cc: Kevin Wolf , qemu block , Lai Jiangshan , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , Stefan Hajnoczi , Yang Hongyang 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 617e431..dbbba5d 100644 --- a/block.c +++ b/block.c @@ -2032,7 +2032,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); @@ -2049,7 +2049,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); -- 2.4.3