From: Keir Fraser Date: Thu, 9 Dec 2010 10:16:03 +0000 (+0000) Subject: x86:vlapic: Fix possible guest tick losing after save/restore X-Git-Tag: 4.0.2-rc1~33 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=dcd985cc869e6a82511db40e658ee88a6656fb51;p=people%2Fvhanquez%2Fxen.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 xen-unstable changeset: 22470:0c97247c64d6 xen-unstable date: Thu Dec 09 08:34:59 2010 +0000 --- diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 83057f91f..0b09aa956 100644 --- 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,