From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOmvb-0004a2-VO for qemu-devel@nongnu.org; Mon, 10 Aug 2015 09:15:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZOmvY-0001ch-KL for qemu-devel@nongnu.org; Mon, 10 Aug 2015 09:15:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOmvY-0001bI-E4 for qemu-devel@nongnu.org; Mon, 10 Aug 2015 09:15:44 -0400 From: Stefan Hajnoczi Date: Mon, 10 Aug 2015 14:15:41 +0100 Message-Id: <1439212541-16997-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v2] error: only prepend timestamp on stderr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Seiji Aguchi , Markus Armbruster , Stefan Hajnoczi , Frank Schreuder The -msg timestamp=on option prepends a timestamp to error messages. This is useful on stderr where it allows users to identify when an error was raised. Timestamps do not make sense on the monitor since error_report() is called in response to a synchronous monitor command and the user already knows "when" the command was issued. Additionally, the rest of the monitor conversation lacks timestamps so the error timestamp cannot be correlated with other activity. Only prepend timestamps on stderr. This fixes libvirt's 'drive_del' processing, which did not expect a timestamp. Other QEMU monitor clients are probably equally confused by timestamps on monitor error messages. Cc: Markus Armbruster Cc: Seiji Aguchi Cc: Frank Schreuder Cc: Daniel P. Berrange Signed-off-by: Stefan Hajnoczi --- util/qemu-error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/qemu-error.c b/util/qemu-error.c index 77ea6c6..c1574bb 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -210,7 +210,7 @@ void error_vreport(const char *fmt, va_list ap) GTimeVal tv; gchar *timestr; - if (enable_timestamp_msg) { + if (enable_timestamp_msg && !cur_mon) { g_get_current_time(&tv); timestr = g_time_val_to_iso8601(&tv); error_printf("%s ", timestr); -- 2.4.3