[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/24] migration/block-dirty-bitmap: fix dirty_bitmap_mig_before_v
From: |
Eric Blake |
Subject: |
[PULL 08/24] migration/block-dirty-bitmap: fix dirty_bitmap_mig_before_vm_start |
Date: |
Mon, 27 Jul 2020 15:55:27 -0500 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
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>
---
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 b0dbf9eeed43..0739f1259e05 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);
}
--
2.27.0
- [PULL 00/24] bitmaps patches for -rc2, 2020-07-27, Eric Blake, 2020/07/27
- [PULL 01/24] qcow2: Fix capitalization of header extension constant., Eric Blake, 2020/07/27
- [PULL 03/24] qemu-iotests/199: drop extra constraints, Eric Blake, 2020/07/27
- [PULL 02/24] qemu-iotests/199: fix style, Eric Blake, 2020/07/27
- [PULL 04/24] qemu-iotests/199: better catch postcopy time, Eric Blake, 2020/07/27
- [PULL 05/24] qemu-iotests/199: improve performance: set bitmap by discard, Eric Blake, 2020/07/27
- [PULL 06/24] qemu-iotests/199: change discard patterns, Eric Blake, 2020/07/27
- [PULL 07/24] qemu-iotests/199: increase postcopy period, Eric Blake, 2020/07/27
- [PULL 08/24] migration/block-dirty-bitmap: fix dirty_bitmap_mig_before_vm_start,
Eric Blake <=
- [PULL 09/24] migration/block-dirty-bitmap: rename state structure types, Eric Blake, 2020/07/27
- [PULL 11/24] migration/block-dirty-bitmap: move mutex init to dirty_bitmap_mig_init, Eric Blake, 2020/07/27
- [PULL 12/24] migration/block-dirty-bitmap: refactor state global variables, Eric Blake, 2020/07/27
- [PULL 10/24] migration/block-dirty-bitmap: rename dirty_bitmap_mig_cleanup, Eric Blake, 2020/07/27
- [PULL 15/24] migration/block-dirty-bitmap: keep bitmap state for all bitmaps, Eric Blake, 2020/07/27
- [PULL 14/24] migration/block-dirty-bitmap: simplify dirty_bitmap_load_complete, Eric Blake, 2020/07/27
- [PULL 13/24] migration/block-dirty-bitmap: rename finish_lock to just lock, Eric Blake, 2020/07/27
- [PULL 16/24] migration/block-dirty-bitmap: relax error handling in incoming part, Eric Blake, 2020/07/27
- [PULL 17/24] migration/block-dirty-bitmap: cancel migration on shutdown, Eric Blake, 2020/07/27
- [PULL 18/24] migration/savevm: don't worry if bitmap migration postcopy failed, Eric Blake, 2020/07/27