From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YStC9-00016O-C3 for qemu-devel@nongnu.org; Tue, 03 Mar 2015 15:13:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YStBz-00081v-Ik for qemu-devel@nongnu.org; Tue, 03 Mar 2015 15:13:33 -0500 From: Max Reitz Date: Tue, 3 Mar 2015 15:13:04 -0500 Message-Id: <1425413591-31413-7-git-send-email-mreitz@redhat.com> In-Reply-To: <1425413591-31413-1-git-send-email-mreitz@redhat.com> References: <1425413591-31413-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v5 06/13] block: Use blk_remove_bs() in blk_delete() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , Fam Zheng , qemu-devel@nongnu.org, Markus Armbruster , Stefan Hajnoczi , Paolo Bonzini , Max Reitz Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block/block-backend.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 755262d..76e6893 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -163,12 +163,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); /* Avoid double-remove after blk_hide_on_behalf_of_hmp_drive_del() */ if (blk->name[0]) { QTAILQ_REMOVE(&blk_backends, blk, link); @@ -324,6 +319,8 @@ void blk_remove_bs(BlockBackend *blk) return; } + assert(blk->bs->blk == blk); + notifier_list_notify(&blk->remove_bs_notifiers, blk); blk_update_root_state(blk); -- 2.1.0