ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Markus Armbruster 2017-07-19 09:33:34 +02:00
parent df95f1a298
commit 70f17a15ca
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util/qemu-error.c
View File

@ -201,6 +201,15 @@ static void vreport(report_type type, const char *fmt, va_list ap)
GTimeVal tv; GTimeVal tv;
gchar *timestr; 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) { switch (type) {
case REPORT_TYPE_ERROR: case REPORT_TYPE_ERROR:
break; break;
@ -212,14 +221,6 @@ static void vreport(report_type type, const char *fmt, va_list ap)
break; 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_vprintf(fmt, ap);
error_printf("\n"); error_printf("\n");
} }