aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorRao, Lei <lei.rao@intel.com>2020-10-16 13:52:01 +0800
committerJason Wang <jasowang@redhat.com>2020-11-11 16:52:23 +0800
commitb70cb3b4854dc4d65c89a8f6704c0f1e9d900ac3 (patch)
tree5c7ede1420aab70c64e696d6428a260f41b5be6a /migration
parent33609e95b206788681263b76d6649a556d064e4d (diff)
Reduce the time of checkpoint for COLO
we should set ram_bulk_stage to false after ram_state_init, otherwise the bitmap will be unused in migration_bitmap_find_dirty. all pages in ram cache will be flushed to the ram of secondary guest for each checkpoint. Signed-off-by: Lei Rao <lei.rao@intel.com> Signed-off-by: Derek Su <dereksu@qnap.com> Signed-off-by: Zhang Chen <chen.zhang@intel.com> Reviewed-by: Li Zhijian <lizhijian@cn.fujitsu.com> Reviewed-by: Zhang Chen <chen.zhang@intel.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/ram.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/migration/ram.c b/migration/ram.c
index 2da2b622ab..add5396a62 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3011,6 +3011,18 @@ static void decompress_data_with_multi_threads(QEMUFile *f,
qemu_mutex_unlock(&decomp_done_lock);
}
+ /*
+ * we must set ram_bulk_stage to false, otherwise in
+ * migation_bitmap_find_dirty the bitmap will be unused and
+ * all the pages in ram cache wil be flushed to the ram of
+ * secondary VM.
+ */
+static void colo_init_ram_state(void)
+{
+ ram_state_init(&ram_state);
+ ram_state->ram_bulk_stage = false;
+}
+
/*
* colo cache: this is for secondary VM, we cache the whole
* memory of the secondary VM, it is need to hold the global lock
@@ -3054,7 +3066,7 @@ int colo_init_ram_cache(void)
}
}
- ram_state_init(&ram_state);
+ colo_init_ram_state();
return 0;
}