[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-3.4-testing] hvm: correct time offset update in RTC write emulation
# HG changeset patch # User Keir Fraser <keir.fraser@xxxxxxxxxx> # Date 1268158493 0 # Node ID d904c3b5e72a7d9c6a0931f9f649723458363d50 # Parent 4fadb10c35a787c9e341b24c4affe44b25f9b3f5 hvm: correct time offset update in RTC write emulation mktime takes a month in 1..12 form while tm->tm_mon contains 0..11 so we need to add 1. Without this fix setting the month back or forward a month inside the guest would lead to the wrong number of days being added/subtracted. Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> xen-unstable changeset: 21013:31ee49f2c4ea xen-unstable date: Tue Mar 09 09:57:25 2010 +0000 --- xen/arch/x86/hvm/rtc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -r 4fadb10c35a7 -r d904c3b5e72a xen/arch/x86/hvm/rtc.c --- a/xen/arch/x86/hvm/rtc.c Tue Mar 09 18:14:25 2010 +0000 +++ b/xen/arch/x86/hvm/rtc.c Tue Mar 09 18:14:53 2010 +0000 @@ -165,7 +165,7 @@ static void rtc_set_time(RTCState *s) ASSERT(spin_is_locked(&s->lock)); - before = mktime(tm->tm_year, tm->tm_mon, tm->tm_mday, + before = mktime(tm->tm_year, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); tm->tm_sec = from_bcd(s, s->hw.cmos_data[RTC_SECONDS]); @@ -179,7 +179,7 @@ static void rtc_set_time(RTCState *s) tm->tm_mon = from_bcd(s, s->hw.cmos_data[RTC_MONTH]) - 1; tm->tm_year = from_bcd(s, s->hw.cmos_data[RTC_YEAR]) + 100; - after = mktime(tm->tm_year, tm->tm_mon, tm->tm_mday, + after = mktime(tm->tm_year, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); /* We use the guest's setting of the RTC to define the local-time _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |