[Qemu-devel] [5878] Fix RTC initial date computation

[Aurelien Jarno]

Revision: 5878
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5878
Author:   aurel32
Date:     2008-12-04 21:34:52 +0000 (Thu, 04 Dec 2008)

Log Message:
-----------
Fix RTC initial date computation

qemu_get_clock() returns a structure containing the time the user wants
to be set (either UTC time, a local time, or a given date). Use mktimegm()
instead of mktime() to convert it into POSIX time without taking the host
timezone into account.

Signed-off-by: Aurelien Jarno <address@hidden>

Modified Paths:
--------------
    trunk/hw/omap1.c
    trunk/hw/pl031.c
    trunk/hw/pxa2xx.c

Modified: trunk/hw/omap1.c
===================================================================
--- trunk/hw/omap1.c    2008-12-04 21:28:28 UTC (rev 5877)
+++ trunk/hw/omap1.c    2008-12-04 21:34:52 UTC (rev 5878)
@@ -3349,7 +3349,7 @@
 
 static void omap_rtc_alarm_update(struct omap_rtc_s *s)
 {
-    s->alarm_ti = mktime(&s->alarm_tm);
+    s->alarm_ti = mktimegm(&s->alarm_tm);
     if (s->alarm_ti == -1)
         printf("%s: conversion failed\n", __FUNCTION__);
 }
@@ -3492,8 +3492,8 @@
 #endif
         memcpy(&new_tm, &s->current_tm, sizeof(new_tm));
         new_tm.tm_mon = omap_rtc_bin(value);
-        ti[0] = mktime(&s->current_tm);
-        ti[1] = mktime(&new_tm);
+        ti[0] = mktimegm(&s->current_tm);
+        ti[1] = mktimegm(&new_tm);
 
         if (ti[0] != -1 && ti[1] != -1) {
             s->ti -= ti[0];
@@ -3511,8 +3511,8 @@
 #endif
         memcpy(&new_tm, &s->current_tm, sizeof(new_tm));
         new_tm.tm_year += omap_rtc_bin(value) - (new_tm.tm_year % 100);
-        ti[0] = mktime(&s->current_tm);
-        ti[1] = mktime(&new_tm);
+        ti[0] = mktimegm(&s->current_tm);
+        ti[1] = mktimegm(&new_tm);
 
         if (ti[0] != -1 && ti[1] != -1) {
             s->ti -= ti[0];
@@ -3719,7 +3719,7 @@
     s->alarm_tm.tm_mday = 0x01;
     s->status = 1 << 7;
     qemu_get_timedate(&tm, 0);
-    s->ti = mktime(&tm);
+    s->ti = mktimegm(&tm);
 
     omap_rtc_alarm_update(s);
     omap_rtc_tick(s);

Modified: trunk/hw/pl031.c
===================================================================
--- trunk/hw/pl031.c    2008-12-04 21:28:28 UTC (rev 5877)
+++ trunk/hw/pl031.c    2008-12-04 21:34:52 UTC (rev 5878)
@@ -206,7 +206,7 @@
     s->irq  = irq;
     /* ??? We assume vm_clock is zero at this point.  */
     qemu_get_timedate(&tm, 0);
-    s->tick_offset = mktime(&tm);
+    s->tick_offset = mktimegm(&tm);
 
     s->timer = qemu_new_timer(vm_clock, pl031_interrupt, s);
 }

Modified: trunk/hw/pxa2xx.c
===================================================================
--- trunk/hw/pxa2xx.c   2008-12-04 21:28:28 UTC (rev 5877)
+++ trunk/hw/pxa2xx.c   2008-12-04 21:34:52 UTC (rev 5878)
@@ -1181,7 +1181,7 @@
     qemu_get_timedate(&tm, 0);
     wom = ((tm.tm_mday - 1) / 7) + 1;
 
-    s->last_rcnr = (uint32_t) mktime(&tm);
+    s->last_rcnr = (uint32_t) mktimegm(&tm);
     s->last_rdcr = (wom << 20) | ((tm.tm_wday + 1) << 17) |
             (tm.tm_hour << 12) | (tm.tm_min << 6) | tm.tm_sec;
     s->last_rycr = ((tm.tm_year + 1900) << 9) |