[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/48] block: Use blk_remove_bs() in blk_delete()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 23/48] block: Use blk_remove_bs() in blk_delete() |
Date: |
Fri, 29 Jan 2016 18:37:29 +0100 |
From: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-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 621787c..7f5ad59 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -166,10 +166,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));
@@ -351,6 +348,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);
--
1.8.3.1
- [Qemu-devel] [PULL 14/48] iotests: Add test for a nonexistent NBD export, (continued)
- [Qemu-devel] [PULL 14/48] iotests: Add test for a nonexistent NBD export, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 16/48] block: Release named dirty bitmaps in bdrv_close(), Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 10/48] iotests: Move _filter_nbd into common.filter, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 15/48] block: Remove unused struct definition BlockFinishData, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 11/48] iotests: Make _filter_nbd drop log lines, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 17/48] iotests: Add test for eject under NBD server, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 08/48] iotests: Rename filter_nbd to _filter_nbd in 083, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 21/48] nbd: Switch from close to eject notifier, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 22/48] block: Remove BDS close notifier, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 24/48] blockdev: Use blk_remove_bs() in do_drive_del(), Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 23/48] block: Use blk_remove_bs() in blk_delete(),
Kevin Wolf <=
- [Qemu-devel] [PULL 18/48] block: Add BB-BDS remove/insert notifiers, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 19/48] virtio-blk: Functions for op blocker management, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 20/48] virtio-scsi: Catch BDS-BB removal/insertion, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 25/48] block: Make bdrv_close() static, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 30/48] iotests: Add test for multiple BB on BDS tree, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 26/48] block: Add list of all BlockDriverStates, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 34/48] qcow: Assign bs->file->bs to file in qcow_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 37/48] iscsi: Assign bs to file in iscsi_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 39/48] qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 32/48] block: acquire in bdrv_query_image_info, Kevin Wolf, 2016/01/29