mirror of https://github.com/xemu-project/xemu.git
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>
This commit is contained in:
parent
aceeaa69d2
commit
deda497b84
|
@ -73,6 +73,7 @@ void error_init(const char *argv0);
|
||||||
})
|
})
|
||||||
|
|
||||||
const char *error_get_progname(void);
|
const char *error_get_progname(void);
|
||||||
extern bool enable_timestamp_msg;
|
|
||||||
|
extern bool error_with_timestamp;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -4167,13 +4167,17 @@ DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386)
|
||||||
|
|
||||||
DEF("msg", HAS_ARG, QEMU_OPTION_msg,
|
DEF("msg", HAS_ARG, QEMU_OPTION_msg,
|
||||||
"-msg timestamp[=on|off]\n"
|
"-msg timestamp[=on|off]\n"
|
||||||
" change the format of messages\n"
|
" control error message format\n"
|
||||||
" on|off controls leading timestamps (default:on)\n",
|
" timestamp=on enables timestamps (default: off)\n",
|
||||||
QEMU_ARCH_ALL)
|
QEMU_ARCH_ALL)
|
||||||
STEXI
|
STEXI
|
||||||
@item -msg timestamp[=on|off]
|
@item -msg timestamp[=on|off]
|
||||||
@findex -msg
|
@findex -msg
|
||||||
prepend a timestamp to each log message.(default:on)
|
Control error message format.
|
||||||
|
@table @option
|
||||||
|
@item timestamp=on|off
|
||||||
|
Prefix messages with a timestamp. Default is off.
|
||||||
|
@end table
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
DEF("dump-vmstate", HAS_ARG, QEMU_OPTION_dump_vmstate,
|
DEF("dump-vmstate", HAS_ARG, QEMU_OPTION_dump_vmstate,
|
||||||
|
|
|
@ -24,6 +24,9 @@ typedef enum {
|
||||||
REPORT_TYPE_INFO,
|
REPORT_TYPE_INFO,
|
||||||
} report_type;
|
} report_type;
|
||||||
|
|
||||||
|
/* Prepend timestamp to messages */
|
||||||
|
bool error_with_timestamp;
|
||||||
|
|
||||||
int error_printf(const char *fmt, ...)
|
int error_printf(const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
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.
|
* Print a message to current monitor if we have one, else to stderr.
|
||||||
* @report_type is the type of message: error, warning or informational.
|
* @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;
|
GTimeVal tv;
|
||||||
gchar *timestr;
|
gchar *timestr;
|
||||||
|
|
||||||
if (enable_timestamp_msg && !cur_mon) {
|
if (error_with_timestamp && !cur_mon) {
|
||||||
g_get_current_time(&tv);
|
g_get_current_time(&tv);
|
||||||
timestr = g_time_val_to_iso8601(&tv);
|
timestr = g_time_val_to_iso8601(&tv);
|
||||||
error_printf("%s ", timestr);
|
error_printf("%s ", timestr);
|
||||||
|
|
Loading…
Reference in New Issue