Patchwork [v5,01/18] block: ensure bdrv_drain_all() works during bdrv_delete()

login
register
mail settings
Submitter Stefan Hajnoczi
Date July 1, 2013, 12:18 p.m.
Message ID <1372681129-18528-2-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/256103/
State New
Headers show

Comments

Stefan Hajnoczi - July 1, 2013, 12:18 p.m.
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>
---
 block.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/block.c b/block.c
index 6c493ad..c26a9f8 100644
--- a/block.c
+++ b/block.c
@@ -1592,11 +1592,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);
 }