summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-10-10 10:15:08 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-12-18 08:36:15 +0100
commitdeda497b846addcc6841274a7ac17e13d3eb146c (patch)
tree6871ad500e565b3e350a32420c3789ecfd4688f7 /util
parentaceeaa69d28e6f08a24395d0aa6915b687d0a681 (diff)
downloadqemu-deda497b846addcc6841274a7ac17e13d3eb146c.zip
error: Fix -msg timestamp default
-msg parameter "timestamp" defaults to "off" if you don't specify msg, and to "on" if you do. Messed up right in commit 5e2ac51917 "add timestamp to error_report()". Mostly harmless, because "timestamp" is the only parameter, so "if you do" is "-msg ''", which nobody does. Change the default to "off" no matter what. While there, rename enable_timestamp_msg to error_with_timestamp, and polish documentation. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20191010081508.8978-1-armbru@redhat.com>
Diffstat (limited to 'util')
-rw-r--r--util/qemu-error.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/util/qemu-error.c b/util/qemu-error.c
index f373f3b3b0..dac7c7dc50 100644
--- a/util/qemu-error.c
+++ b/util/qemu-error.c
@@ -24,6 +24,9 @@ typedef enum {
REPORT_TYPE_INFO,
} report_type;
+/* Prepend timestamp to messages */
+bool error_with_timestamp;
+
int error_printf(const char *fmt, ...)
{
va_list ap;
@@ -191,7 +194,6 @@ static void print_loc(void)
}
}
-bool enable_timestamp_msg;
/*
* Print a message to current monitor if we have one, else to stderr.
* @report_type is the type of message: error, warning or informational.
@@ -204,7 +206,7 @@ static void vreport(report_type type, const char *fmt, va_list ap)
GTimeVal tv;
gchar *timestr;
- if (enable_timestamp_msg && !cur_mon) {
+ if (error_with_timestamp && !cur_mon) {
g_get_current_time(&tv);
timestr = g_time_val_to_iso8601(&tv);
error_printf("%s ", timestr);