summaryrefslogtreecommitdiffstats
path: root/softmmu
diff options
context:
space:
mode:
authorPaolo Bonzini2021-02-09 15:57:59 +0100
committerPaolo Bonzini2021-03-06 11:42:57 +0100
commit7520c4f0847093aefa87f23113f28d5d1d574aed (patch)
treef939d92a2e016cf23bddafec734e17342b6decdf /softmmu
parenttrace: fix "-trace file=..." (diff)
downloadqemu-7520c4f0847093aefa87f23113f28d5d1d574aed.tar.gz
qemu-7520c4f0847093aefa87f23113f28d5d1d574aed.tar.xz
qemu-7520c4f0847093aefa87f23113f28d5d1d574aed.zip
trace: skip qemu_set_log_filename if no "-D" option was passed
When the "simple" backend is not active but the "log" backend is, both "-trace file=" and "-D" will result in a call to qemu_set_log_filename. Unfortunately, QEMU was also calling qemu_set_log_filename if "-D" was not passed, so the "-trace file=" option had no effect and the tracepoints went back to stderr. Fortunately we can just skip qemu_set_log_filename in that case, because the log backend will initialize itself just fine as soon as qemu_set_log is called, also in qemu_process_early_options. Cc: stefanha@redhat.com Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20210209145759.141231-3-pbonzini@redhat.com>
Diffstat (limited to 'softmmu')
-rw-r--r--softmmu/vl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 2f4958db2a..ff488ea3e7 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2364,7 +2364,9 @@ static void qemu_process_early_options(void)
#endif
/* Open the logfile at this point and set the log mask if necessary. */
- qemu_set_log_filename(log_file, &error_fatal);
+ if (log_file) {
+ qemu_set_log_filename(log_file, &error_fatal);
+ }
if (log_mask) {
int mask;
mask = qemu_str_to_log_mask(log_mask);