From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFpKI-0006YN-90 for qemu-devel@nongnu.org; Mon, 26 Jan 2015 14:27:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFpKH-0001j3-Ee for qemu-devel@nongnu.org; Mon, 26 Jan 2015 14:27:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54927) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFpKH-0001ix-8E for qemu-devel@nongnu.org; Mon, 26 Jan 2015 14:27:57 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0QJRuZ9013903 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 26 Jan 2015 14:27:56 -0500 From: Max Reitz Date: Mon, 26 Jan 2015 14:27:33 -0500 Message-Id: <1422300468-16216-7-git-send-email-mreitz@redhat.com> In-Reply-To: <1422300468-16216-1-git-send-email-mreitz@redhat.com> References: <1422300468-16216-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 06/21] block: Use blk_remove_bs() in blk_delete() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Markus Armbruster , Stefan Hajnoczi , Max Reitz Signed-off-by: Max Reitz --- 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 b825d8e..a7264a0 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -164,12 +164,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_do_drive_del() */ if (blk->name[0]) { QTAILQ_REMOVE(&blk_backends, blk, link); @@ -333,6 +328,8 @@ void blk_remove_bs(BlockBackend *blk) return; } + assert(blk->bs->blk == blk); + blk_update_root_state(blk); bdrv_unref(blk->bs); -- 2.1.0