[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/7] migration/block-dirty-bitmap: simplify dirty_bitmap_load_com
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 3/7] migration/block-dirty-bitmap: simplify dirty_bitmap_load_complete |
Date: |
Wed, 22 Jan 2020 16:23:24 +0300 |
bdrv_enable_dirty_bitmap_locked() call does nothing, as if we are in
postcopy, bitmap successor must be enabled, and reclaim operation will
enable the bitmap.
So, actually we need just call _reclaim_ in both if branches, and
making differences only to add an assertion seems not really good. The
logic becomes simple: on load complete we do reclaim and that's all.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
migration/block-dirty-bitmap.c | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 502e858c31..eeaab2174e 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -526,6 +526,10 @@ static void dirty_bitmap_load_complete(QEMUFile *f)
qemu_mutex_lock(&dbm_load_state.lock);
+ if (bdrv_dirty_bitmap_has_successor(s->bitmap)) {
+ bdrv_reclaim_dirty_bitmap(s->bitmap, &error_abort);
+ }
+
for (item = dbm_load_state.enabled_bitmaps; item;
item = g_slist_next(item))
{
@@ -537,27 +541,6 @@ static void dirty_bitmap_load_complete(QEMUFile *f)
}
}
- if (bdrv_dirty_bitmap_has_successor(s->bitmap)) {
- bdrv_dirty_bitmap_lock(s->bitmap);
- if (dbm_load_state.enabled_bitmaps == NULL) {
- /* in postcopy */
- bdrv_reclaim_dirty_bitmap_locked(s->bitmap, &error_abort);
- bdrv_enable_dirty_bitmap_locked(s->bitmap);
- } else {
- /* target not started, successor must be empty */
- int64_t count = bdrv_get_dirty_count(s->bitmap);
- BdrvDirtyBitmap *ret = bdrv_reclaim_dirty_bitmap_locked(s->bitmap,
- NULL);
- /* bdrv_reclaim_dirty_bitmap can fail only on no successor (it
- * must be) or on merge fail, but merge can't fail when second
- * bitmap is empty
- */
- assert(ret == s->bitmap &&
- count == bdrv_get_dirty_count(s->bitmap));
- }
- bdrv_dirty_bitmap_unlock(s->bitmap);
- }
-
qemu_mutex_unlock(&dbm_load_state.lock);
}
--
2.21.0
- [PATCH 0/7] Fix crashes on early shutdown during bitmaps postcopy, Vladimir Sementsov-Ogievskiy, 2020/01/22
- [PATCH 3/7] migration/block-dirty-bitmap: simplify dirty_bitmap_load_complete,
Vladimir Sementsov-Ogievskiy <=
- [PATCH 5/7] migration/block-dirty-bitmap: cancel migration on shutdown, Vladimir Sementsov-Ogievskiy, 2020/01/22
- [PATCH 6/7] migration: handle to_src_file on target only for ram postcopy, Vladimir Sementsov-Ogievskiy, 2020/01/22
- [PATCH 7/7] qemu-iotests/199: add early shutdown case to bitmaps postcopy, Vladimir Sementsov-Ogievskiy, 2020/01/22
- [PATCH 2/7] migration/block-dirty-bitmap: rename finish_lock to just lock, Vladimir Sementsov-Ogievskiy, 2020/01/22
- [PATCH 4/7] migration/block-dirty-bitmap: keep bitmap state for all bitmaps, Vladimir Sementsov-Ogievskiy, 2020/01/22
- [PATCH 1/7] migration/block-dirty-bitmap: refactor incoming state to be one struct, Vladimir Sementsov-Ogievskiy, 2020/01/22