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 <kw...@redhat.com>
Cc: Alistair Francis <alistair.fran...@xilinx.com>
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <1500449614-16811-1-git-send-email-arm...@redhat.com>
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
Reviewed-by: Kevin Wolf <kw...@redhat.com>
---
util/qemu-error.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/util/qemu-error.c b/util/qemu-error.c
index c557c6a..a25d3b9 100644
--- a/util/qemu-error.c
+++ b/util/qemu-error.c
@@ -201,17 +201,6 @@ static void vreport(report_type type, const char *fmt,
va_list ap)
GTimeVal tv;
gchar *timestr;
- switch (type) {
- case REPORT_TYPE_ERROR:
- break;
- case REPORT_TYPE_WARNING:
- error_printf("warning: ");
- break;
- case REPORT_TYPE_INFO:
- error_printf("info: ");
- break;
- }
-
if (enable_timestamp_msg && !cur_mon) {
g_get_current_time(&tv);
timestr = g_time_val_to_iso8601(&tv);
@@ -220,6 +209,18 @@ static void vreport(report_type type, const char *fmt,
va_list ap)
}
print_loc();
+
+ switch (type) {
+ case REPORT_TYPE_ERROR:
+ break;
+ case REPORT_TYPE_WARNING:
+ error_printf("warning: ");
+ break;
+ case REPORT_TYPE_INFO:
+ error_printf("info: ");
+ break;
+ }
+
error_vprintf(fmt, ap);
error_printf("\n");
}
--
2.7.5
