From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGCas-0000ek-Jn for qemu-devel@nongnu.org; Tue, 27 Jan 2015 15:18:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGCan-000583-74 for qemu-devel@nongnu.org; Tue, 27 Jan 2015 15:18:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48901) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGCam-00057x-Um for qemu-devel@nongnu.org; Tue, 27 Jan 2015 15:18:33 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0RKISu5021513 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 27 Jan 2015 15:18:31 -0500 From: Max Reitz Date: Tue, 27 Jan 2015 14:46:10 -0500 Message-Id: <1422387983-32153-38-git-send-email-mreitz@redhat.com> In-Reply-To: <1422387983-32153-1-git-send-email-mreitz@redhat.com> References: <1422387983-32153-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH RESEND 37/50] block: Add blk_remove_bs() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Jeff Cody , Markus Armbruster , Max Reitz , Stefan Hajnoczi , John Snow This function removes the BlockDriverState associated with the given BlockBackend from that BB and sets the BDS pointer in the BB to NULL. Signed-off-by: Max Reitz --- block/block-backend.c | 22 +++++++++++++++++++++- include/sysemu/block-backend.h | 1 + 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/block/block-backend.c b/block/block-backend.c index 656ebfc..d2c1bff 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -312,6 +312,22 @@ void blk_hide_on_behalf_of_do_drive_del(BlockBackend *blk) } /* + * Disassociates the currently associated BlockDriverState from @blk. + */ +void blk_remove_bs(BlockBackend *blk) +{ + if (!blk->bs) { + return; + } + + blk_update_root_state(blk); + + bdrv_unref(blk->bs); + blk->bs->blk = NULL; + blk->bs = NULL; +} + +/* * Associates a new BlockDriverState with @blk. */ void blk_insert_bs(BlockBackend *blk, BlockDriverState *bs) @@ -321,9 +337,13 @@ void blk_insert_bs(BlockBackend *blk, BlockDriverState *bs) } assert(!blk->bs); - assert(!bs->blk); bdrv_ref(bs); blk->bs = bs; + + if (bs->blk) { + blk_remove_bs(bs->blk); + } + bs->blk = blk; } diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index b6cf5bf..c8b47f7 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -72,6 +72,7 @@ BlockBackend *blk_by_name(const char *name); BlockBackend *blk_next(BlockBackend *blk); BlockDriverState *blk_bs(BlockBackend *blk); +void blk_remove_bs(BlockBackend *blk); void blk_insert_bs(BlockBackend *blk, BlockDriverState *bs); void blk_hide_on_behalf_of_do_drive_del(BlockBackend *blk); -- 2.1.0