From 2398588be16ecf266a575cf99e87724beed45b07 Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Tue, 27 Nov 2012 23:29:04 -0200
Subject: [PATCH] --- yaml --- r: 343547 b: refs/heads/master c:
 d98d07ca7e0347d712d54a865af323c4aee04bc2 h: refs/heads/master i:   343545:
 3f5eccdefc5aee7cd95631ca4c13e7aa055055a8   343543:
 e052b94b77aca56bcdf886c112ece624424e2a84 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b30b968ca261..9d3c886c3247 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b48aa97e38206a84bf8485e7c553412274708ce5
+refs/heads/master: d98d07ca7e0347d712d54a865af323c4aee04bc2
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 422ef5ed2194..fd766214d9da 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -2627,7 +2627,12 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 			kvm_x86_ops->write_tsc_offset(vcpu, offset);
 			vcpu->arch.tsc_catchup = 1;
 		}
-		kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu);
+		/*
+		 * On a host with synchronized TSC, there is no need to update
+		 * kvmclock on vcpu->cpu migration
+		 */
+		if (!vcpu->kvm->arch.use_master_clock || vcpu->cpu == -1)
+			kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu);
 		if (vcpu->cpu != cpu)
 			kvm_migrate_timers(vcpu);
 		vcpu->cpu = cpu;