Commit e6ce5e92 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

migration/block-dirty-bitmap: fix dirty_bitmap_mig_before_vm_start 



Using the _locked version of bdrv_enable_dirty_bitmap to bypass locking
is wrong as we do not already own the mutex.  Moreover, the adjacent
call to bdrv_dirty_bitmap_enable_successor grabs the mutex.

Fixes: 58f72b965e9e1q
Cc: qemu-stable@nongnu.org # v3.0
Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarAndrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20200727194236.19551-8-vsementsov@virtuozzo.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent e80a4150

migration/block-dirty-bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ void dirty_bitmap_mig_before_vm_start(void) 
        DirtyBitmapLoadBitmapState *b = item->data;



        if (b->migrated) {

            bdrv_enable_dirty_bitmap_locked(b->bitmap);

            bdrv_enable_dirty_bitmap(b->bitmap);

        } else {

            bdrv_dirty_bitmap_enable_successor(b->bitmap);

        }