[PULL,38/85] block: bdrv_close: release bitmaps after drv->bdrv_close

Commit Message

Max Reitz July 11, 2017, 4:07 p.m. UTC

From: Vladimir Sementsov-Ogievskiy <[e-mail]>

Release bitmaps after 'if (bs->drv) { ... }' block. This will allow
format driver to save persistent bitmaps, which will appear in following
commits.

Signed-off-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
Reviewed-by: Max Reitz <[e-mail]>
Message-id: [e-mail]
Signed-off-by: Max Reitz <[e-mail]>
---
 block.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/block.c b/block.c
index 3ec6624..700431d 100644
--- a/block.c
+++ b/block.c
@@ -3054,9 +3054,6 @@  static void bdrv_close(BlockDriverState *bs)
     bdrv_flush(bs);
     bdrv_drain(bs); /* in case flush left pending I/O */
 
-    bdrv_release_named_dirty_bitmaps(bs);
-    assert(QLIST_EMPTY(&bs->dirty_bitmaps));
-
     if (bs->drv) {
         BdrvChild *child, *next;
 
@@ -3094,6 +3091,9 @@  static void bdrv_close(BlockDriverState *bs)
         bs->full_open_options = NULL;
     }
 
+    bdrv_release_named_dirty_bitmaps(bs);
+    assert(QLIST_EMPTY(&bs->dirty_bitmaps));
+
     QLIST_FOREACH_SAFE(ban, &bs->aio_notifiers, list, ban_next) {
         g_free(ban);
     }