summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2016-03-22 13:54:08 +0100
committerKevin Wolf <kwolf@redhat.com>2016-03-30 11:59:32 +0200
commit72f41b6fbd19113247f1ff46f844e9b79cbd5e48 (patch)
tree89b612500836a85d0722d63f399a28638ee6cd7a
parentd0855f1235ed203700a3a24fc7e138490c272117 (diff)
downloadqemu-72f41b6fbd19113247f1ff46f844e9b79cbd5e48.tar.gz
block: Remove blk_set_bs()
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>
-rw-r--r--block/block-backend.c17
-rw-r--r--include/block/block_int.h2
2 files changed, 0 insertions, 19 deletions
diff --git a/block/block-backend.c b/block/block-backend.c
index adf592e867..e578a2d5e3 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -372,23 +372,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 ba6e9ac696..a33b0de40b 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);