From: Keir Fraser Date: Thu, 9 Dec 2010 08:34:59 +0000 (+0000) Subject: x86:vlapic: Fix possible guest tick losing after save/restore X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=73c602edff0024f5f4b27d3e3d0a7fcf724083f3;p=xen.git 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 --- diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 483588a99b..cf0ee21081 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -955,12 +955,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,