From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0Ebh-0001zJ-4O for qemu-devel@nongnu.org; Wed, 03 Jun 2015 15:45:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0Ebc-00016b-2S for qemu-devel@nongnu.org; Wed, 03 Jun 2015 15:45:45 -0400 From: Max Reitz Date: Wed, 3 Jun 2015 21:44:06 +0200 Message-Id: <1433360659-1915-26-git-send-email-mreitz@redhat.com> In-Reply-To: <1433360659-1915-1-git-send-email-mreitz@redhat.com> References: <1433360659-1915-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 25/38] block: Add blk_remove_bs() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , qemu-devel@nongnu.org, Markus Armbruster , Stefan Hajnoczi , Max Reitz , 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 Reviewed-by: Eric Blake --- 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 4d6532f..93c14f9 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -312,6 +312,22 @@ void blk_hide_on_behalf_of_hmp_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 8561380..eba3130 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_hmp_drive_del(BlockBackend *blk); -- 2.4.1