From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 27 Jun 2013 13:32:26 +0000 (+0200)
Subject: block: ensure bdrv_drain_all() works during bdrv_delete()
X-Git-Tag: v1.7.0-rc0~168^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1b5c52e04d04bb93546c6e37e8884889d047cb1;p=thirdparty%2Fqemu.git

block: ensure bdrv_drain_all() works during bdrv_delete()

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 <stefanha@redhat.com>
---

diff --git a/block.c b/block.c
index 01b66d802a6..d5ce8d39e42 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);
 }