On 25/9/25 11:44, Daniel P. Berrangé wrote:
The error_report function can include the program name in any
messages it prints. The qemu_log function has no equivalent
behaviour.
This introduces support for a "program name" in the new
messages API, which will be included by default for all
binaries.
This change tweaks the output of the error_report function,
adding a space between the program name and the location
info. The qemu_log function will gain the program name. This
can be easily seen with the 'log' trace backend, and how it
is now more closely matching error_report output.
Before:
# qemu-system-x86_64 -object tls-creds-x509,id=t0,dir=fish -d
'trace:qcrypto*'
qcrypto_tls_creds_x509_load TLS creds x509 load creds=0x5584e13937f0 dir=fish
qcrypto_tls_creds_get_path TLS creds path creds=0x5584e13937f0
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: qcrypto_tls_creds_x509_load TLS creds x509 load
creds=0x5584e13937f0 dir=fish
qemu-system-x86_64: qcrypto_tls_creds_get_path TLS creds path creds=0x5584e13937f0
filename=ca-cert.pem path=<none>
qemu-system-x86_64: Unable to access credentials fish/ca-cert.pem: No such
file or directory
Reviewed-by: Richard Henderson <[email protected]>
Signed-off-by: Daniel P. Berrangé <[email protected]>
---
include/qemu/message.h | 1 +
system/vl.c | 2 +-
tests/unit/test-error-report.c | 5 +++--
util/error-report.c | 4 ----
util/message.c | 9 ++++++++-
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/util/message.c b/util/message.c
index a91c008e08..1db9254733 100644
--- a/util/message.c
+++ b/util/message.c
@@ -5,7 +5,7 @@
#include "qemu/message.h"
#include "monitor/monitor.h"
-static int message_format;
+static int message_format = QMESSAGE_FORMAT_PROGRAM_NAME;
static char *message_workloadname;
void qmessage_set_format(int flags)
@@ -30,4 +30,11 @@ void qmessage_context_print(FILE *fp)
message_workloadname) {
fprintf(fp, "%s ", message_workloadname);
}
+
+ if (message_format & QMESSAGE_FORMAT_PROGRAM_NAME) {
+ const char *pgnamestr = g_get_prgname();
+ if (pgnamestr) {
+ fprintf(fp, "%s: ", pgnamestr);
No formatting needed, use fputs()?
+ }
+ }
}
