diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 14:34:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 14:34:42 +0100 |
| commit | 1d1424ba86580ea68503a9b468ce4c8d511c5c9f (patch) | |
| tree | 0062f277d49a6dea254c9a335f7ed8a5a7cd488e | |
| parent | cf44d31d35df3de9d4f49339254050195f777f3e (diff) | |
| parent | 70f17a15ca0fe47eeae1ac83086130e6e7ba57c8 (diff) | |
| download | focaccia-qemu-1d1424ba86580ea68503a9b468ce4c8d511c5c9f.tar.gz focaccia-qemu-1d1424ba86580ea68503a9b468ce4c8d511c5c9f.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2017-07-24' into staging
Error reporting patches for 2017-07-24 # gpg: Signature made Mon 24 Jul 2017 13:17:49 BST # gpg: using RSA key 0x3870B400EB918653 # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-error-2017-07-24: error: Revert unwanted change of warning messages Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | util/qemu-error.c | 17 |
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"); } |