30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
|
# Commit 48535f5798e3e237d9920a74c1ce3802958136c0
|
||
|
|
# Date 2013-11-08 11:07:14 +0100
|
||
|
|
# Author Kouya Shimura <kouya@jp.fujitsu.com>
|
||
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
||
|
|
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 <kouya@jp.fujitsu.com>
|
||
|
|
Reviewed-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
Acked-by: Tim Deegan <tim@xen.org>
|
||
|
|
|
||
|
|
--- 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);
|
||
|
|
}
|