39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Tim Deegan <tim@xen.org>
|
||
|
|
# Date 1358508717 -3600
|
||
|
|
# Node ID 9e8c39bdc1fedd5dfc5aa7209cc5f77f813476c7
|
||
|
|
# Parent 8f6dd5dc5d6cdd56050ed917a0c30903bbddcbf0
|
||
|
|
x86/hvm: fix RTC setting.
|
||
|
|
|
||
|
|
When the guest writes one field of the RTC time, we must bring all the
|
||
|
|
other fields up to date for the current second before calculating the
|
||
|
|
new RTC time.
|
||
|
|
|
||
|
|
Signed-off-by: Tim Deegan <tim@xen.org>
|
||
|
|
Tested-by: Phil Evans <Phil.Evans@m247.com>
|
||
|
|
Committed-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/hvm/rtc.c
|
||
|
|
+++ b/xen/arch/x86/hvm/rtc.c
|
||
|
|
@@ -399,10 +399,17 @@ static int rtc_ioport_write(void *opaque
|
||
|
|
case RTC_DAY_OF_MONTH:
|
||
|
|
case RTC_MONTH:
|
||
|
|
case RTC_YEAR:
|
||
|
|
- s->hw.cmos_data[s->hw.cmos_index] = data;
|
||
|
|
- /* if in set mode, do not update the time */
|
||
|
|
- if ( !(s->hw.cmos_data[RTC_REG_B] & RTC_SET) )
|
||
|
|
+ /* if in set mode, just write the register */
|
||
|
|
+ if ( (s->hw.cmos_data[RTC_REG_B] & RTC_SET) )
|
||
|
|
+ s->hw.cmos_data[s->hw.cmos_index] = data;
|
||
|
|
+ else
|
||
|
|
+ {
|
||
|
|
+ /* Fetch the current time and update just this field. */
|
||
|
|
+ s->current_tm = gmtime(get_localtime(d));
|
||
|
|
+ rtc_copy_date(s);
|
||
|
|
+ s->hw.cmos_data[s->hw.cmos_index] = data;
|
||
|
|
rtc_set_time(s);
|
||
|
|
+ }
|
||
|
|
alarm_timer_update(s);
|
||
|
|
break;
|
||
|
|
case RTC_REG_A:
|