From 7622acf5609614a58e8284c017348f0b2248c27e Mon Sep 17 00:00:00 2001
From: Eddie Dong <eddie.dong@intel.com>
Date: Mon, 3 Sep 2007 16:15:12 +0300
Subject: [PATCH] --- yaml --- r: 68414 b: refs/heads/master c:
 a3d7f85f471f889e4477863a7ca42828ae74e77d h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/kvm/irq.h   |  1 +
 trunk/drivers/kvm/lapic.c | 14 ++++++++++++++
 trunk/drivers/kvm/svm.c   |  1 +
 trunk/drivers/kvm/vmx.c   |  4 +++-
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4d1cf11f9c36..a05d25ef56e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b9778dae71dc64d3678d766c0f1fbed79c80f9f
+refs/heads/master: a3d7f85f471f889e4477863a7ca42828ae74e77d
diff --git a/trunk/drivers/kvm/irq.h b/trunk/drivers/kvm/irq.h
index 87baf7e69ea2..f324cfb40084 100644
--- a/trunk/drivers/kvm/irq.h
+++ b/trunk/drivers/kvm/irq.h
@@ -158,5 +158,6 @@ void kvm_apic_timer_intr_post(struct kvm_vcpu *vcpu, int vec);
 void kvm_timer_intr_post(struct kvm_vcpu *vcpu, int vec);
 void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu);
 void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu);
+void kvm_migrate_apic_timer(struct kvm_vcpu *vcpu);
 
 #endif
diff --git a/trunk/drivers/kvm/lapic.c b/trunk/drivers/kvm/lapic.c
index 490d4939dba7..2706ec36c258 100644
--- a/trunk/drivers/kvm/lapic.c
+++ b/trunk/drivers/kvm/lapic.c
@@ -979,3 +979,17 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu)
 	update_divide_count(apic);
 	start_apic_timer(apic);
 }
+
+void kvm_migrate_apic_timer(struct kvm_vcpu *vcpu)
+{
+	struct kvm_lapic *apic = vcpu->apic;
+	struct hrtimer *timer;
+
+	if (!apic)
+		return;
+
+	timer = &apic->timer.dev;
+	if (hrtimer_cancel(timer))
+		hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS);
+}
+EXPORT_SYMBOL_GPL(kvm_migrate_apic_timer);
diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c
index 00119ec41669..3de9ec35ebf9 100644
--- a/trunk/drivers/kvm/svm.c
+++ b/trunk/drivers/kvm/svm.c
@@ -633,6 +633,7 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 		delta = vcpu->host_tsc - tsc_this;
 		svm->vmcb->control.tsc_offset += delta;
 		vcpu->cpu = cpu;
+		kvm_migrate_apic_timer(vcpu);
 	}
 
 	for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++)
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
index eeecadf5da46..f4618b9edf9c 100644
--- a/trunk/drivers/kvm/vmx.c
+++ b/trunk/drivers/kvm/vmx.c
@@ -441,8 +441,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 	u64 phys_addr = __pa(vmx->vmcs);
 	u64 tsc_this, delta;
 
-	if (vcpu->cpu != cpu)
+	if (vcpu->cpu != cpu) {
 		vcpu_clear(vmx);
+		kvm_migrate_apic_timer(vcpu);
+	}
 
 	if (per_cpu(current_vmcs, cpu) != vmx->vmcs) {
 		u8 error;