All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] error: Revert unwanted change of warning messages
@ 2017-07-19  7:33 Markus Armbruster
  2017-07-19  8:08 ` Alistair Francis
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Markus Armbruster @ 2017-07-19  7:33 UTC (permalink / raw)
  To: qemu-devel; +Cc: kwolf, Alistair Francis

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>
---
 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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-07-24 12:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-19  7:33 [Qemu-devel] [PATCH] error: Revert unwanted change of warning messages Markus Armbruster
2017-07-19  8:08 ` Alistair Francis
2017-07-19  9:20 ` no-reply
2017-07-19 13:50   ` Eric Blake
2017-07-24 12:15 ` Kevin Wolf

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.