29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Keir Fraser <keir@xen.org>
|
||
|
|
# Date 1291883699 0
|
||
|
|
# Node ID 0c97247c64d61511acff37d1903cb304b387f397
|
||
|
|
# Parent 84a72f957fe9e1a5af3dfb8f53334faa555e22f8
|
||
|
|
x86:vlapic: Fix possible guest tick losing after save/restore
|
||
|
|
|
||
|
|
Guest vcpu may totally lose all ticks if the vlapic->pt.irq was not
|
||
|
|
restored during save/restore process. Fix it.
|
||
|
|
|
||
|
|
Signed-off-by: Wei Gang <gang.wei@intel.com>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/hvm/vlapic.c
|
||
|
|
+++ b/xen/arch/x86/hvm/vlapic.c
|
||
|
|
@@ -863,12 +863,12 @@ static void lapic_rearm(struct vlapic *s
|
||
|
|
unsigned long tmict = vlapic_get_reg(s, APIC_TMICT);
|
||
|
|
uint64_t period;
|
||
|
|
|
||
|
|
+ s->pt.irq = vlapic_get_reg(s, APIC_LVTT) & APIC_VECTOR_MASK;
|
||
|
|
if ( (tmict = vlapic_get_reg(s, APIC_TMICT)) == 0 )
|
||
|
|
return;
|
||
|
|
|
||
|
|
period = ((uint64_t)APIC_BUS_CYCLE_NS *
|
||
|
|
(uint32_t)tmict * s->hw.timer_divisor);
|
||
|
|
- s->pt.irq = vlapic_get_reg(s, APIC_LVTT) & APIC_VECTOR_MASK;
|
||
|
|
create_periodic_time(vlapic_vcpu(s), &s->pt, period,
|
||
|
|
vlapic_lvtt_period(s) ? period : 0,
|
||
|
|
s->pt.irq, vlapic_pt_cb,
|