From cb483a68fdc3503efc9b0996570e58aaf0c11c17 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Tue, 23 Feb 2016 10:47:01 +0100 Subject: [PATCH] qemu: Fix a race when computing migration downtime Computing a total downtime during a migration requires us to store a time stamp when guest CPUs get stopped. The value (and all other statistics) is then transferred to the destination to compute the downtime. Because the stopped time stamp is stored by a STOP event handler while the statistics which will be sent over to the destination are copied synchronously within qemuMigrationWaitForCompletion. Depending on the timing of STOP and MIGRATION events, we may end up copying (and transferring) statistics without the stopped time stamp set. Let's make sure we always use the correct time stamp. https://bugzilla.redhat.com/show_bug.cgi?id=1282744 Signed-off-by: Jiri Denemark --- src/qemu/qemu_migration.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index c9f8422dab..7cbb228dd3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4510,6 +4510,8 @@ qemuMigrationRun(virQEMUDriverPtr driver, priv->job.current->type = VIR_DOMAIN_JOB_FAILED; goto cleanup; } + if (priv->job.completed) + priv->job.completed->stopped = priv->job.current->stopped; ret = 0; -- 2.39.5