From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LQ39D-0000GN-BN
	for qemu-devel@nongnu.org; Thu, 22 Jan 2009 12:15:19 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LQ39C-0000Fo-Mj
	for qemu-devel@nongnu.org; Thu, 22 Jan 2009 12:15:18 -0500
Received: from [199.232.76.173] (port=52648 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LQ39C-0000Fi-EN
	for qemu-devel@nongnu.org; Thu, 22 Jan 2009 12:15:18 -0500
Received: from savannah.gnu.org ([199.232.41.3]:52519 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 1LQ39C-0005zc-7m
	for qemu-devel@nongnu.org; Thu, 22 Jan 2009 12:15:18 -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 1LQ39B-0004Cy-N2
	for qemu-devel@nongnu.org; Thu, 22 Jan 2009 17:15:17 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LQ39B-0004Ct-B0
	for qemu-devel@nongnu.org; Thu, 22 Jan 2009 17:15:17 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LQ39B-0004Ct-B0@cvs.savannah.gnu.org>
Date: Thu, 22 Jan 2009 17:15:17 +0000
Subject: [Qemu-devel] [6399] monitor-mux: fix timestamp prefixes (Jan Kiszka)
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: 6399
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6399
Author:   aliguori
Date:     2009-01-22 17:15:16 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
monitor-mux: fix timestamp prefixes (Jan Kiszka)

rt_clock returns milliseconds. Fix mux'ed monitor terminal timestamps
accordingly.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/qemu-char.c

Modified: trunk/qemu-char.c
===================================================================
--- trunk/qemu-char.c	2009-01-22 16:59:28 UTC (rev 6398)
+++ trunk/qemu-char.c	2009-01-22 17:15:16 UTC (rev 6399)
@@ -241,13 +241,13 @@
                 if (term_timestamps_start == -1)
                     term_timestamps_start = ti;
                 ti -= term_timestamps_start;
-                secs = ti / 1000000000;
+                secs = ti / 1000;
                 snprintf(buf1, sizeof(buf1),
                          "[%02d:%02d:%02d.%03d] ",
                          secs / 3600,
                          (secs / 60) % 60,
                          secs % 60,
-                         (int)((ti / 1000000) % 1000));
+                         (int)(ti % 1000));
                 d->drv->chr_write(d->drv, (uint8_t *)buf1, strlen(buf1));
             }
         }