diff options
| author | zhanghailiang <zhang.zhanghailiang@huawei.com> | 2016-10-27 14:43:02 +0800 |
|---|---|---|
| committer | Amit Shah <amit@amitshah.net> | 2016-10-30 15:17:39 +0530 |
| commit | 18cc23d72cabf708d5a7e6b5948ec0420a1a2ebd (patch) | |
| tree | 20de49e0d9a24c78aaf6b6a59fbc5b5f16369bb0 | |
| parent | 68b5359187c3d4164cc546dcdd5ba3e37f0ffb55 (diff) | |
| download | focaccia-qemu-18cc23d72cabf708d5a7e6b5948ec0420a1a2ebd.tar.gz focaccia-qemu-18cc23d72cabf708d5a7e6b5948ec0420a1a2ebd.zip | |
COLO: Synchronize PVM's state to SVM periodically
Do checkpoint periodically, the default interval is 200ms. Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Amit Shah <amit@amitshah.net>
| -rw-r--r-- | migration/colo.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/migration/colo.c b/migration/colo.c index bb9b8703f1..a35cc59731 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qemu/timer.h" #include "sysemu/sysemu.h" #include "migration/colo.h" #include "io/channel-buffer.h" @@ -226,6 +227,7 @@ static void colo_process_checkpoint(MigrationState *s) { QIOChannelBuffer *bioc; QEMUFile *fb = NULL; + int64_t current_time, checkpoint_time = qemu_clock_get_ms(QEMU_CLOCK_HOST); Error *local_err = NULL; int ret; @@ -254,10 +256,20 @@ static void colo_process_checkpoint(MigrationState *s) trace_colo_vm_state_change("stop", "run"); while (s->state == MIGRATION_STATUS_COLO) { + current_time = qemu_clock_get_ms(QEMU_CLOCK_HOST); + if (current_time - checkpoint_time < + s->parameters.x_checkpoint_delay) { + int64_t delay_ms; + + delay_ms = s->parameters.x_checkpoint_delay - + (current_time - checkpoint_time); + g_usleep(delay_ms * 1000); + } ret = colo_do_checkpoint_transaction(s, bioc, fb); if (ret < 0) { goto out; } + checkpoint_time = qemu_clock_get_ms(QEMU_CLOCK_HOST); } out: |