|
 |
7a3408 |
From 779b0c17407ca656c666a0eb6f66d6210bf65eca Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <779b0c17407ca656c666a0eb6f66d6210bf65eca@dist-git>
|
|
|
7a3408 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
Date: Thu, 1 Oct 2015 21:39:35 +0200
|
|
|
7a3408 |
Subject: [PATCH] qemu: Always update migration times on destination
|
|
|
7a3408 |
|
|
|
7a3408 |
Even if we are migrating a domain with VIR_MIGRATE_PAUSED flag set, we
|
|
|
7a3408 |
should still update the total time of the migration. Updating downtime
|
|
|
7a3408 |
doesn't hurt either, even though we don't actually start guest CPUs.
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
(cherry picked from commit d27c66dbaae33d9b463eab8a8a2b0ad8cebff06a)
|
|
|
7a3408 |
|
|
|
7a3408 |
https://bugzilla.redhat.com/show_bug.cgi?id=1265902
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/qemu/qemu_migration.c | 9 +++++----
|
|
|
7a3408 |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
7a3408 |
index cb82687..759fd21 100644
|
|
|
7a3408 |
--- a/src/qemu/qemu_migration.c
|
|
|
7a3408 |
+++ b/src/qemu/qemu_migration.c
|
|
|
7a3408 |
@@ -5735,10 +5735,11 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
|
|
|
7a3408 |
}
|
|
|
7a3408 |
goto endjob;
|
|
|
7a3408 |
}
|
|
|
7a3408 |
- if (priv->job.completed) {
|
|
|
7a3408 |
- qemuDomainJobInfoUpdateTime(priv->job.completed);
|
|
|
7a3408 |
- qemuDomainJobInfoUpdateDowntime(priv->job.completed);
|
|
|
7a3408 |
- }
|
|
|
7a3408 |
+ }
|
|
|
7a3408 |
+
|
|
|
7a3408 |
+ if (priv->job.completed) {
|
|
|
7a3408 |
+ qemuDomainJobInfoUpdateTime(priv->job.completed);
|
|
|
7a3408 |
+ qemuDomainJobInfoUpdateDowntime(priv->job.completed);
|
|
|
7a3408 |
}
|
|
|
7a3408 |
|
|
|
7a3408 |
dom = virGetDomain(dconn, vm->def->name, vm->def->uuid);
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.6.1
|
|
|
7a3408 |
|