From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAMFW-0005hY-C9 for qemu-devel@nongnu.org; Fri, 16 Aug 2013 11:47:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VAMFQ-00041Z-C5 for qemu-devel@nongnu.org; Fri, 16 Aug 2013 11:47:38 -0400 From: Stefan Hajnoczi Date: Fri, 16 Aug 2013 17:47:07 +0200 Message-Id: <1376668044-25116-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1376668044-25116-1-git-send-email-stefanha@redhat.com> References: <1376668044-25116-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 01/18] block: ensure bdrv_drain_all() works during bdrv_delete() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , qemu-stable@nongnu.org, Stefan Hajnoczi In bdrv_delete() make sure to call bdrv_make_anon() *after* bdrv_close() so that the device is still seen by bdrv_drain_all() when iterating bdrv_states. Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi --- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 01b66d8..d5ce8d3 100644 --- a/block.c +++ b/block.c @@ -1606,11 +1606,11 @@ void bdrv_delete(BlockDriverState *bs) assert(!bs->job); assert(!bs->in_use); + bdrv_close(bs); + /* remove from list, if necessary */ bdrv_make_anon(bs); - bdrv_close(bs); - g_free(bs); } -- 1.8.3.1