diff mbox series

[2/2] migration/colo: More accurate update checkpoint time

Message ID 20211110174156.3834330-2-chen.zhang@intel.com (mailing list archive)
State New, archived
Headers show
Series [1/2] migration/colo: Optimize COLO start code path | expand

Commit Message

Zhang Chen Nov. 10, 2021, 5:41 p.m. UTC 
Previous operation(like vm_start and replication_start_all) will consume
extra time before update the timer, so reduce time in this patch.

Signed-off-by: Zhang Chen <chen.zhang@intel.com>
---
 migration/colo.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Juan Quintela Nov. 16, 2021, 4:30 p.m. UTC | #1 
Zhang Chen <chen.zhang@intel.com> wrote:
> Previous operation(like vm_start and replication_start_all) will consume
> extra time before update the timer, so reduce time in this patch.
>
> Signed-off-by: Zhang Chen <chen.zhang@intel.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Queued for 7.0.
diff mbox series

Patch

diff --git a/migration/colo.c b/migration/colo.c
index ad1a4426b3..e3c8cecc24 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -530,7 +530,6 @@  static void colo_process_checkpoint(MigrationState *s)
 {
     QIOChannelBuffer *bioc;
     QEMUFile *fb = NULL;
-    int64_t current_time = qemu_clock_get_ms(QEMU_CLOCK_HOST);
     Error *local_err = NULL;
     int ret;
 
@@ -578,8 +577,8 @@  static void colo_process_checkpoint(MigrationState *s)
     qemu_mutex_unlock_iothread();
     trace_colo_vm_state_change("stop", "run");
 
-    timer_mod(s->colo_delay_timer,
-            current_time + s->parameters.x_checkpoint_delay);
+    timer_mod(s->colo_delay_timer, qemu_clock_get_ms(QEMU_CLOCK_HOST) +
+              s->parameters.x_checkpoint_delay);
 
     while (s->state == MIGRATION_STATUS_COLO) {
         if (failover_get_state() != FAILOVER_STATUS_NONE) {