summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Reitz2015-10-26 21:39:05 +0100
committerKevin Wolf2015-11-11 16:22:46 +0100
commit1c95f7e1aff8417ff6e6cc23bc2d04fbcf79d37e (patch)
treeb3d39c2fdb23e362525c5d81421996a971c982ad
parentblock: Don't call blk_bs() twice in bdrv_lookup_bs() (diff)
downloadqemu-1c95f7e1aff8417ff6e6cc23bc2d04fbcf79d37e.tar.gz
qemu-1c95f7e1aff8417ff6e6cc23bc2d04fbcf79d37e.tar.xz
qemu-1c95f7e1aff8417ff6e6cc23bc2d04fbcf79d37e.zip
block: Add blk_remove_bs()
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 <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/block-backend.c12
-rw-r--r--include/sysemu/block-backend.h1
2 files changed, 13 insertions, 0 deletions
diff --git a/block/block-backend.c b/block/block-backend.c
index 19fdaaec1a..878c448855 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -334,6 +334,18 @@ void blk_hide_on_behalf_of_hmp_drive_del(BlockBackend *blk)
}
/*
+ * Disassociates the currently associated BlockDriverState from @blk.
+ */
+void blk_remove_bs(BlockBackend *blk)
+{
+ blk_update_root_state(blk);
+
+ blk->bs->blk = NULL;
+ bdrv_unref(blk->bs);
+ blk->bs = NULL;
+}
+
+/*
* Associates a new BlockDriverState with @blk.
*/
void blk_insert_bs(BlockBackend *blk, BlockDriverState *bs)
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 9306a527bb..14a6d32bb2 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);