[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 37/50] block: Add blk_remove_bs()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 37/50] block: Add blk_remove_bs() |
Date: |
Mon, 26 Jan 2015 11:03:11 -0500 |
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 <address@hidden>
---
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 656ebfc..d2c1bff 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -312,6 +312,22 @@ void blk_hide_on_behalf_of_do_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 b6cf5bf..c8b47f7 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_do_drive_del(BlockBackend *blk);
--
2.1.0
- [Qemu-devel] [PATCH 27/50] blockdev: Check BB validity in blockdev-backup, (continued)
- [Qemu-devel] [PATCH 27/50] blockdev: Check BB validity in blockdev-backup, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 24/50] blockdev: Check BB validity in block-stream, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 28/50] blockdev: Check BB validity in drive-mirror, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 29/50] blockdev: Check BB validity in find_block_job(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 34/50] blockdev: Do not create BDS for empty drive, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 26/50] blockdev: Check BB validity in drive-backup, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 32/50] blockdev: Check BB validity in eject and change, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 31/50] block: Add blk_insert_bs(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 33/50] blockdev: Respect NULL BDS in do_drive_del(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 30/50] blockdev: Check BB validity in change-backing-file, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 37/50] block: Add blk_remove_bs(),
Max Reitz <=
- [Qemu-devel] [PATCH 36/50] blockdev: Allow more options for BB-less BDS tree, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 35/50] blockdev: Pull out blockdev option extraction, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 43/50] blockdev: Implement change with basic operations, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 44/50] block: Inquire tray state before tray-moved events, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 39/50] blockdev: Add blockdev-close-tray, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 38/50] blockdev: Add blockdev-open-tray, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 40/50] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 49/50] iotests: More options for VM.add_drive(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 42/50] blockdev: Implement eject with basic operations, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 45/50] qmp: Introduce blockdev-change-medium, Max Reitz, 2015/01/26