From 615cf669b55a689f9e535ecf87075e50004b6e0a Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Mon, 10 Aug 2015 14:15:41 +0100 Subject: [PATCH] error: only prepend timestamp on stderr 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 Message-Id: <1439212541-16997-1-git-send-email-stefanha@redhat.com> Reviewed-by: Daniel P. Berrange Tested-by: Frank Schreuder Signed-off-by: Markus Armbruster --- 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.7.4