From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvGw-0002rt-6N for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:09:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akvGq-00065p-21 for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:09:34 -0400 From: Kevin Wolf Date: Tue, 29 Mar 2016 17:08:08 +0200 Message-Id: <1459264128-12761-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1459264128-12761-1-git-send-email-kwolf@redhat.com> References: <1459264128-12761-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 08/48] block: Remove blk_set_bs() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org The function is unused since commit f21d96d0 ('block: Use BdrvChild in BlockBackend'). Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- block/block-backend.c | 17 ----------------- include/block/block_int.h | 2 -- 2 files changed, 19 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index dca21d1..4b44d46 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -371,23 +371,6 @@ BlockDriverState *blk_bs(BlockBackend *blk) } /* - * Changes the BlockDriverState attached to @blk - */ -void blk_set_bs(BlockBackend *blk, BlockDriverState *bs) -{ - bdrv_ref(bs); - - if (blk->root) { - blk->root->bs->blk = NULL; - bdrv_root_unref_child(blk->root); - } - assert(bs->blk == NULL); - - blk->root = bdrv_root_attach_child(bs, "root", &child_root); - bs->blk = blk; -} - -/* * Return @blk's DriveInfo if any, else null. */ DriveInfo *blk_legacy_dinfo(BlockBackend *blk) diff --git a/include/block/block_int.h b/include/block/block_int.h index ba6e9ac..a33b0de 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -704,8 +704,6 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs, const BdrvChildRole *child_role); void bdrv_root_unref_child(BdrvChild *child); -void blk_set_bs(BlockBackend *blk, BlockDriverState *bs); - void blk_dev_change_media_cb(BlockBackend *blk, bool load); bool blk_dev_has_removable_media(BlockBackend *blk); bool blk_dev_has_tray(BlockBackend *blk); -- 1.8.3.1