]> xenbits.xensource.com Git - people/pauldu/qemu.git/commitdiff
block: Remove blk_set_bs()
authorKevin Wolf <kwolf@redhat.com>
Tue, 22 Mar 2016 12:54:08 +0000 (13:54 +0100)
committerKevin Wolf <kwolf@redhat.com>
Wed, 30 Mar 2016 09:59:32 +0000 (11:59 +0200)
The function is unused since commit f21d96d0 ('block: Use BdrvChild in
BlockBackend').

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
block/block-backend.c
include/block/block_int.h

index adf592e8676136e26657d9d148780dcd227fa3a3..e578a2d5e31e494457f6f26615c3868fd122900f 100644 (file)
@@ -371,23 +371,6 @@ BlockDriverState *blk_bs(BlockBackend *blk)
     return blk->root ? blk->root->bs : NULL;
 }
 
-/*
- * 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.
  */
index ba6e9ac69680ad6e884c904ee580b001c43b87fa..a33b0de40bf9b564a6513af1233800e9330fd75f 100644 (file)
@@ -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);