diff options
author | Vladimir Sementsov-Ogievskiy | 2020-07-27 21:42:22 +0200 |
---|---|---|
committer | Eric Blake | 2020-07-27 22:39:59 +0200 |
commit | e6ce5e92248be5547daaee3eb6cd226e9820cf7b (patch) | |
tree | 26fc958942f7e8009b06fb30cddeed432e035c9c /migration | |
parent | qemu-iotests/199: increase postcopy period (diff) | |
download | qemu-e6ce5e92248be5547daaee3eb6cd226e9820cf7b.tar.gz qemu-e6ce5e92248be5547daaee3eb6cd226e9820cf7b.tar.xz qemu-e6ce5e92248be5547daaee3eb6cd226e9820cf7b.zip |
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: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200727194236.19551-8-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r-- | migration/block-dirty-bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index b0dbf9eeed..0739f1259e 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -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); } |