summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMarkus Armbruster2017-07-19 09:33:34 +0200
committerMarkus Armbruster2017-07-24 14:16:29 +0200
commit70f17a15ca0fe47eeae1ac83086130e6e7ba57c8 (patch)
treec26807848ce73bcdb614ec1cc3db095310c5b949 /util
parentMerge remote-tracking branch 'remotes/sstabellini/tags/xen-20170721-tag' into... (diff)
downloadqemu-70f17a15ca0fe47eeae1ac83086130e6e7ba57c8.tar.gz
qemu-70f17a15ca0fe47eeae1ac83086130e6e7ba57c8.tar.xz
qemu-70f17a15ca0fe47eeae1ac83086130e6e7ba57c8.zip
error: Revert unwanted change of warning messages
Commit 97f4030 changed warning messages from timestamp-if-enabled progname ":" location "warning: " message to "warning: " timestamp-if-enabled progname ":" location message This regressed qemu-iotests 051. Put "warning: " right back where it was, along with "info: ". Reported-by: Kevin Wolf <kwolf@redhat.com> Cc: Alistair Francis <alistair.francis@xilinx.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1500449614-16811-1-git-send-email-armbru@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'util')
-rw-r--r--util/qemu-error.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/util/qemu-error.c b/util/qemu-error.c
index c557c6ae47..a25d3b94c6 100644
--- a/util/qemu-error.c
+++ b/util/qemu-error.c
@@ -201,6 +201,15 @@ static void vreport(report_type type, const char *fmt, va_list ap)
GTimeVal tv;
gchar *timestr;
+ if (enable_timestamp_msg && !cur_mon) {
+ g_get_current_time(&tv);
+ timestr = g_time_val_to_iso8601(&tv);
+ error_printf("%s ", timestr);
+ g_free(timestr);
+ }
+
+ print_loc();
+
switch (type) {
case REPORT_TYPE_ERROR:
break;
@@ -212,14 +221,6 @@ static void vreport(report_type type, const char *fmt, va_list ap)
break;
}
- if (enable_timestamp_msg && !cur_mon) {
- g_get_current_time(&tv);
- timestr = g_time_val_to_iso8601(&tv);
- error_printf("%s ", timestr);
- g_free(timestr);
- }
-
- print_loc();
error_vprintf(fmt, ap);
error_printf("\n");
}