[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v7 16/24] block: Use blk_remove_bs() in blk_delete()
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v7 16/24] block: Use blk_remove_bs() in blk_delete() |
Date: |
Mon, 9 Nov 2015 23:39:25 +0100 |
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <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 a00486c..4523387 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);
}
assert(QLIST_EMPTY(&blk->remove_bs_notifiers.notifiers));
assert(QLIST_EMPTY(&blk->insert_bs_notifiers.notifiers));
@@ -349,6 +346,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-block] [PATCH v7 12/24] virtio-blk: Functions for op blocker management, (continued)
[Qemu-block] [PATCH v7 13/24] virtio-scsi: Catch BDS-BB removal/insertion, Max Reitz, 2015/11/09
[Qemu-block] [PATCH v7 14/24] nbd: Switch from close to eject notifier, Max Reitz, 2015/11/09
[Qemu-block] [PATCH v7 15/24] block: Remove BDS close notifier, Max Reitz, 2015/11/09
[Qemu-block] [PATCH v7 16/24] block: Use blk_remove_bs() in blk_delete(),
Max Reitz <=
[Qemu-block] [PATCH v7 17/24] blockdev: Use blk_remove_bs() in do_drive_del(), Max Reitz, 2015/11/09
[Qemu-block] [PATCH v7 18/24] block: Make bdrv_close() static, Max Reitz, 2015/11/09
[Qemu-block] [PATCH v7 19/24] block: Add list of all BlockDriverStates, Max Reitz, 2015/11/09
[Qemu-block] [PATCH v7 20/24] blockdev: Keep track of monitor-owned BDS, Max Reitz, 2015/11/09
[Qemu-block] [PATCH v7 21/24] block: Add blk_remove_all_bs(), Max Reitz, 2015/11/09
[Qemu-block] [PATCH v7 23/24] iotests: Add test for multiple BB on BDS tree, Max Reitz, 2015/11/09