[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/34] error: Fix -msg timestamp default
From: |
Markus Armbruster |
Subject: |
[PULL 01/34] error: Fix -msg timestamp default |
Date: |
Tue, 17 Dec 2019 07:26:18 +0100 |
-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 <address@hidden>
Message-Id: <address@hidden>
---
include/qemu/error-report.h | 3 ++-
util/qemu-error.c | 6 ++++--
vl.c | 2 +-
qemu-options.hx | 10 +++++++---
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h
index 00d069b20f..87532d8596 100644
--- a/include/qemu/error-report.h
+++ b/include/qemu/error-report.h
@@ -73,6 +73,7 @@ void error_init(const char *argv0);
})
const char *error_get_progname(void);
-extern bool enable_timestamp_msg;
+
+extern bool error_with_timestamp;
#endif
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);
diff --git a/vl.c b/vl.c
index c0904b365b..7ed92db055 100644
--- a/vl.c
+++ b/vl.c
@@ -1263,7 +1263,7 @@ static void realtime_init(void)
static void configure_msg(QemuOpts *opts)
{
- enable_timestamp_msg = qemu_opt_get_bool(opts, "timestamp", true);
+ error_with_timestamp = qemu_opt_get_bool(opts, "timestamp", false);
}
diff --git a/qemu-options.hx b/qemu-options.hx
index 3ff8c4e07a..c9bcd66e98 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4246,13 +4246,17 @@ DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386)
DEF("msg", HAS_ARG, QEMU_OPTION_msg,
"-msg timestamp[=on|off]\n"
- " change the format of messages\n"
- " on|off controls leading timestamps (default:on)\n",
+ " control error message format\n"
+ " timestamp=on enables timestamps (default: off)\n",
QEMU_ARCH_ALL)
STEXI
@item -msg timestamp[=on|off]
@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
DEF("dump-vmstate", HAS_ARG, QEMU_OPTION_dump_vmstate,
--
2.21.0
- [PULL 00/34] Error reporting patches for 2019-12-16, Markus Armbruster, 2019/12/17
- [PULL 14/34] tests-blockjob: Use error_free_or_abort(), Markus Armbruster, 2019/12/17
- [PULL 01/34] error: Fix -msg timestamp default,
Markus Armbruster <=
- [PULL 04/34] io: Fix Error usage in a comment <example>, Markus Armbruster, 2019/12/17
- [PULL 02/34] crypto: Fix certificate file error handling crash bug, Markus Armbruster, 2019/12/17
- [PULL 11/34] memory-device: Fix memory pre-plug error API violations, Markus Armbruster, 2019/12/17
- [PULL 08/34] hw/core: Fix fit_load_fdt() error API violations, Markus Armbruster, 2019/12/17
- [PULL 03/34] crypto: Fix typo in QCryptoTLSSession's <example> comment, Markus Armbruster, 2019/12/17
- [PULL 13/34] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize(), Markus Armbruster, 2019/12/17
- [PULL 05/34] tests: Clean up initialization of Error *err variables, Markus Armbruster, 2019/12/17
- [PULL 07/34] hw/acpi: Fix legacy CPU plug error API violations, Markus Armbruster, 2019/12/17
- [PULL 26/34] monitor/qmp-cmds: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 33/34] hw/vfio/ap: drop local_err from vfio_ap_realize, Markus Armbruster, 2019/12/17