From: Kouya Shimura Date: Fri, 8 Nov 2013 10:07:14 +0000 (+0100) Subject: x86/hvm: fix restart of RTC periodic timer with vpt_align=1 X-Git-Tag: 4.4.0-rc1~311 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=48535f5798e3e237d9920a74c1ce3802958136c0;p=xen.git x86/hvm: fix restart of RTC periodic timer with vpt_align=1 The commit 58afa7ef "x86/hvm: Run the RTC periodic timer on a consistent time series" aligns the RTC periodic timer to the VM's boot time. However, it's aligned later again to the system time in create_periodic_time() with vpt_align=1. The next tick might be skipped. Signed-off-by: Kouya Shimura Reviewed-by: Jan Beulich Acked-by: Tim Deegan --- diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index d1a6848fbb..cdedefe3dd 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -130,7 +130,10 @@ static void rtc_timer_update(RTCState *s) s->pt_code = period_code; period = 1 << (period_code - 1); /* period in 32 Khz cycles */ period = DIV_ROUND(period * 1000000000ULL, 32768); /* in ns */ - delta = period - ((NOW() - s->start_time) % period); + if ( v->domain->arch.hvm_domain.params[HVM_PARAM_VPT_ALIGN] ) + delta = 0; + else + delta = period - ((NOW() - s->start_time) % period); create_periodic_time(v, &s->pt, delta, period, RTC_IRQ, NULL, s); }