From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LOWZq-0005yc-6p
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 07:16:30 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LOWZp-0005yQ-KA
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 07:16:29 -0500
Received: from [199.232.76.173] (port=36673 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LOWZp-0005yN-Es
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 07:16:29 -0500
Received: from savannah.gnu.org ([199.232.41.3]:40878 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LOWZp-00059U-9U
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 07:16:29 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LOWZo-0000GW-34
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 12:16:28 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LOWZn-0000GJ-9r
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 12:16:27 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LOWZn-0000GJ-9r@cvs.savannah.gnu.org>
Date: Sun, 18 Jan 2009 12:16:27 +0000
Subject: [Qemu-devel] [6364] cuda: fix crash on Windows
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6364
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6364
Author:   aurel32
Date:     2009-01-18 12:16:26 +0000 (Sun, 18 Jan 2009)

Log Message:
-----------
cuda: fix crash on Windows

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/hw/cuda.c

Modified: trunk/hw/cuda.c
===================================================================
--- trunk/hw/cuda.c	2009-01-18 12:16:15 UTC (rev 6363)
+++ trunk/hw/cuda.c	2009-01-18 12:16:26 UTC (rev 6364)
@@ -756,8 +756,8 @@
 
     s->timers[1].index = 1;
 
-    qemu_get_timedate(&tm, RTC_OFFSET);
-    s->tick_offset = mktimegm(&tm);
+    qemu_get_timedate(&tm, 0);
+    s->tick_offset = (uint32_t)mktimegm(&tm) + RTC_OFFSET;
 
     s->adb_poll_timer = qemu_new_timer(vm_clock, cuda_adb_poll, s);
     *cuda_mem_index = cpu_register_io_memory(0, cuda_read, cuda_write, s);