repository: /home/avi/kvm/linux-2.6
branch: master
commit 5b25a47c1edb6ba9ac23e745260e7533be371c1d
Author: He, Qing <[EMAIL PROTECTED]>
Date: Mon Sep 10 11:01:52 2007 +0300
KVM: fix apic timer migration when inactive
When local apic timer is inactive or is expired in one shot mode, it
should not be restarted on vcpu and hrtimer migration. This patch fixes
this.
Signed-off-by: Qing He <[EMAIL PROTECTED]>
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
diff --git a/drivers/kvm/lapic.c b/drivers/kvm/lapic.c
index 4374855..a894dee 100644
--- a/drivers/kvm/lapic.c
+++ b/drivers/kvm/lapic.c
@@ -1037,11 +1037,12 @@ void kvm_migrate_apic_timer(struct kvm_vcpu *vcpu)
struct kvm_lapic *apic = vcpu->apic;
struct hrtimer *timer;
- if (apic) {
- timer = &apic->timer.dev;
- hrtimer_cancel(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);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
