[qemu-xen stable-4.14] migration/block-dirty-bitmap: fix dirty_bitmap_mig_before_vm_start

[patchbot@xxxxxxx]

commit 08550a9940fc9b07a8f7ff7e2c7b47eb825b87d3
Author:     Vladimir Sementsov-Ogievskiy <vsementsov@xxxxxxxxxxxxx>
AuthorDate: Mon Jul 27 22:42:22 2020 +0300
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Wed Sep 9 18:51:39 2020 -0500

    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@xxxxxxxxxx # v3.0
    Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@xxxxxxxxxxxxx>
    Reviewed-by: Andrey Shinkevich <andrey.shinkevich@xxxxxxxxxxxxx>
    Reviewed-by: Eric Blake <eblake@xxxxxxxxxx>
    Message-Id: <20200727194236.19551-8-vsementsov@xxxxxxxxxxxxx>
    Signed-off-by: Eric Blake <eblake@xxxxxxxxxx>
    (cherry picked from commit e6ce5e92248be5547daaee3eb6cd226e9820cf7b)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 migration/block-dirty-bitmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 7eafface61..16f1793ee3 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -498,7 +498,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);
         }
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.14