The message context is now extended to be able to include the
thread ID and thread name, after the program name. On Linux
the thread ID will match the process TID visible in /proc,
while on other platforms it will merely be an integer repr
of the system thread object address/ID.
This changes the output for both error_report and qemu_log,
when running under the system emulators or the QEMU storage
daemon. Other programs omit the thread information since
they are largely single threaded, though potentially it
would be useful to enable in all of them, given that the RCU
thread will always get spawned by a constructor function.
Before:
# qemu-system-x86_64 -object tls-creds-x509,id=t0,dir=fish -d 'trace:qcrypto*'
qemu-system-x86_64: qcrypto_tls_creds_x509_load TLS creds x509 load
creds=0x560db818e080 dir=fish
qemu-system-x86_64: qcrypto_tls_creds_get_path TLS creds path
creds=0x560db818e080 filename=ca-cert.pem path=<none>
qemu-system-x86_64: Unable to access credentials fish/ca-cert.pem: No such
file or directory
After:
# qemu-system-x86_64 -object tls-creds-x509,id=t0,dir=fish -d 'trace:qcrypto*'
qemu-system-x86_64(772366:main): qcrypto_tls_creds_x509_load TLS creds x509
load creds=0x560db818e080 dir=fish
qemu-system-x86_64(772366:main): qcrypto_tls_creds_get_path TLS creds path
creds=0x560db818e080 filename=ca-cert.pem path=<none>
qemu-system-x86_64(772366:main): Unable to access credentials
fish/ca-cert.pem: No such file or directory
Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
---
include/qemu/message.h | 1 +
storage-daemon/qemu-storage-daemon.c | 6 ++++++
system/vl.c | 8 ++++++--
tests/qemu-iotests/041 | 2 +-
tests/qemu-iotests/common.filter | 2 +-
util/message.c | 27 ++++++++++++++++++++-------
6 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/include/qemu/message.h b/include/qemu/message.h
index 4550ce8ed7..6dbb068ca9 100644
--- a/include/qemu/message.h
+++ b/include/qemu/message.h
@@ -7,6 +7,7 @@ enum QMessageFormatFlags {
QMESSAGE_FORMAT_TIMESTAMP = (1 << 0),
QMESSAGE_FORMAT_WORKLOAD_NAME = (1 << 1),
QMESSAGE_FORMAT_PROGRAM_NAME = (1 << 2),
+ QMESSAGE_FORMAT_THREAD_INFO = (1 << 3),
};
/**
diff --git a/storage-daemon/qemu-storage-daemon.c
b/storage-daemon/qemu-storage-daemon.c
index eb72561358..cc44ed7848 100644
--- a/storage-daemon/qemu-storage-daemon.c
+++ b/storage-daemon/qemu-storage-daemon.c
@@ -47,6 +47,7 @@
#include "qemu/cutils.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
+#include "qemu/message.h"
#include "qemu/help_option.h"
#include "qemu/job.h"
#include "qemu/log.h"
@@ -65,6 +66,10 @@ static const char *pid_file;
static char *pid_file_realpath;
static volatile bool exit_requested = false;
+#define QMESSAGE_FORMAT_DEFAULT \
+ (QMESSAGE_FORMAT_PROGRAM_NAME | \
+ QMESSAGE_FORMAT_THREAD_INFO)
+
void qemu_system_killed(int signal, pid_t pid)
{
exit_requested = true;
@@ -399,6 +404,7 @@ int main(int argc, char *argv[])
#endif
error_init(argv[0]);
+ qmessage_set_format(QMESSAGE_FORMAT_DEFAULT);
qemu_init_exec_dir(argv[0]);
os_setup_signal_handling();
diff --git a/system/vl.c b/system/vl.c
index 9030212c50..20b655a7bc 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -145,6 +145,10 @@
#define MAX_VIRTIO_CONSOLES 1
+#define QMESSAGE_FORMAT_DEFAULT \
+ (QMESSAGE_FORMAT_PROGRAM_NAME | \
+ QMESSAGE_FORMAT_THREAD_INFO)
+
typedef struct BlockdevOptionsQueueEntry {
BlockdevOptions *bdo;
Location loc;
@@ -811,10 +815,9 @@ static void realtime_init(void)
}
}
-
static void configure_msg(QemuOpts *opts)
{
- int flags = QMESSAGE_FORMAT_PROGRAM_NAME;
+ int flags = QMESSAGE_FORMAT_DEFAULT;
if (qemu_opt_get_bool(opts, "timestamp", false)) {
flags |= QMESSAGE_FORMAT_TIMESTAMP;
}
@@ -2888,6 +2891,7 @@ void qemu_init(int argc, char **argv)
module_call_init(MODULE_INIT_OPTS);
error_init(argv[0]);
+ qmessage_set_format(QMESSAGE_FORMAT_DEFAULT);
qemu_init_exec_dir(argv[0]);
os_setup_limits();
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index 8452845f44..d9954da42b 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -1102,7 +1102,7 @@ class TestRepairQuorum(iotests.QMPTestCase):
self.vm.shutdown()
log = iotests.filter_qtest(self.vm.get_log())
log = re.sub(r'^Formatting.*\n', '', log)
- log = re.sub(r'^%s: ' % os.path.basename(iotests.qemu_prog), '', log)
+ log = re.sub(r'^%s\(.*\): ' % os.path.basename(iotests.qemu_prog), '',
log)
self.assertEqual(log,
"Can no longer replace 'img1' by 'repair0', because "
+
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index 511a55b1e8..ecf74c223e 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -81,7 +81,7 @@ _filter_qemu_io()
# replace occurrences of QEMU_PROG with "qemu"
_filter_qemu()
{
- gsed -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG):#\1QEMU_PROG:#" \
+ gsed -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG)(.*):#\1QEMU_PROG:#" \
-e 's#^QEMU [0-9]\+\.[0-9]\+\.[0-9]\+ monitor#QEMU X.Y.Z monitor#' \
-e $'s#\r##' # QEMU monitor uses \r\n line endings
}
diff --git a/util/message.c b/util/message.c
index f1c4f92e7b..300dc10a4f 100644
--- a/util/message.c
+++ b/util/message.c
@@ -44,11 +44,24 @@ char *qmessage_context(int flags)
pgnamestr = g_get_prgname();
}
- return g_strdup_printf("%s%s%s%s%s%s",
- timestr ? timestr : "",
- timestr ? " " : "",
- wknamestr ? wknamestr : "",
- wknamestr ? " " : "",
- pgnamestr ? pgnamestr : "",
- pgnamestr ? ": " : "");
+ if (message_format & QMESSAGE_FORMAT_THREAD_INFO) {
+ uint64_t thid = qemu_thread_get_id();
+ const char *thname = qemu_thread_get_name();
+
+ return g_strdup_printf("%s%s%s%s%s(%" PRIu64 ":%s): ",
+ timestr ? timestr : "",
+ timestr ? " " : "",
+ wknamestr ? wknamestr : "",
+ wknamestr ? " " : "",
+ pgnamestr ? pgnamestr : "",
+ thid, thname);
+ } else {
+ return g_strdup_printf("%s%s%s%s%s%s",
+ timestr ? timestr : "",
+ timestr ? " " : "",
+ wknamestr ? wknamestr : "",
+ wknamestr ? " " : "",
+ pgnamestr ? pgnamestr : "",
+ pgnamestr ? ": " : "");
+ }
}
--
2.50.1
