[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 24/37] block: Add blk_remove_bs()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 24/37] block: Add blk_remove_bs() |
Date: |
Mon, 9 Feb 2015 12:11:24 -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>
Reviewed-by: Eric Blake <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 0202923..00e96da 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 6a4a6ba..e234aca 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 v2 17/37] block: Prepare remaining BB functions for NULL BDS, (continued)
- [Qemu-devel] [PATCH v2 17/37] block: Prepare remaining BB functions for NULL BDS, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 14/37] block: Add BlockBackendRootState, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 18/37] blockdev: Use BB for blockdev-backup transaction, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 16/37] block: Fail requests to empty BlockBackend, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 13/37] block: Move I/O status and error actions into BB, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 15/37] block: Make some BB functions fall back to BBRS, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 19/37] block: Add blk_insert_bs(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 21/37] blockdev: Do not create BDS for empty drive, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 24/37] block: Add blk_remove_bs(),
Max Reitz <=
- [Qemu-devel] [PATCH v2 22/37] blockdev: Pull out blockdev option extraction, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 34/37] blockdev: read-only-mode for blockdev-change-medium, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 27/37] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 33/37] hmp: Use blockdev-change-medium for change command, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 36/37] iotests: More options for VM.add_drive(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 31/37] block: Inquire tray state before tray-moved events, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 32/37] qmp: Introduce blockdev-change-medium, Max Reitz, 2015/02/09