[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 08/15] block: Use blk_remove_bs() in blk_delete()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v6 08/15] block: Use blk_remove_bs() in blk_delete() |
Date: |
Wed, 4 Nov 2015 19:57:40 +0100 |
Signed-off-by: Max Reitz <address@hidden>
---
block/block-backend.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 38580f7..5702cc1 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -165,10 +165,7 @@ static void blk_delete(BlockBackend *blk)
assert(!blk->refcnt);
assert(!blk->dev);
if (blk->bs) {
- assert(blk->bs->blk == blk);
- blk->bs->blk = NULL;
- bdrv_unref(blk->bs);
- blk->bs = NULL;
+ blk_remove_bs(blk);
}
if (blk->root_state.throttle_state) {
g_free(blk->root_state.throttle_group);
@@ -347,6 +344,8 @@ void blk_hide_on_behalf_of_hmp_drive_del(BlockBackend *blk)
*/
void blk_remove_bs(BlockBackend *blk)
{
+ assert(blk->bs->blk == blk);
+
notifier_list_notify(&blk->remove_bs_notifiers, blk);
blk_update_root_state(blk);
--
2.6.2
- Re: [Qemu-devel] [PATCH v6 04/15] iotests: Move _filter_nbd into common.filter, (continued)
[Qemu-devel] [PATCH v6 05/15] iotests: Make redirecting qemu's stderr optional, Max Reitz, 2015/11/04
[Qemu-devel] [PATCH v6 06/15] iotests: Add test for eject under NBD server, Max Reitz, 2015/11/04
[Qemu-devel] [PATCH v6 07/15] block: Move BDS close notifiers into BB, Max Reitz, 2015/11/04
[Qemu-devel] [PATCH v6 08/15] block: Use blk_remove_bs() in blk_delete(),
Max Reitz <=
[Qemu-devel] [PATCH v6 09/15] blockdev: Use blk_remove_bs() in do_drive_del(), Max Reitz, 2015/11/04
[Qemu-devel] [PATCH v6 10/15] block: Make bdrv_close() static, Max Reitz, 2015/11/04
[Qemu-devel] [PATCH v6 11/15] block: Add list of all BlockDriverStates, Max Reitz, 2015/11/04
[Qemu-devel] [PATCH v6 12/15] blockdev: Keep track of monitor-owned BDS, Max Reitz, 2015/11/04
[Qemu-devel] [PATCH v6 13/15] block: Add blk_remove_all_bs(), Max Reitz, 2015/11/04