Message ID | 20170503122539.282182-13-vsementsov@virtuozzo.com |
---|---|
State | New |
Headers | show |
On 2017-05-03 14:25, Vladimir Sementsov-Ogievskiy wrote: > 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 <vsementsov@virtuozzo.com> > --- > block.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Max Reitz <mreitz@redhat.com>
diff --git a/block.c b/block.c index 5db266be21..17c853f3ee 100644 --- a/block.c +++ b/block.c @@ -2949,9 +2949,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; @@ -2990,6 +2987,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); }
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 <vsementsov@virtuozzo.com> --- block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)