[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/19] tracing: only allow -trace to override -D if set
From: |
Alex Bennée |
Subject: |
[PULL 09/19] tracing: only allow -trace to override -D if set |
Date: |
Wed, 26 Feb 2020 07:39:19 +0000 |
Otherwise any -D settings the user may have made get ignored.
Signed-off-by: Alex Bennée <address@hidden>
Tested-by: Laurent Vivier <address@hidden>
Reviewed-by: Robert Foley <address@hidden>
Message-Id: <address@hidden>
diff --git a/trace/control.c b/trace/control.c
index 6c775e68eba..2ffe0008184 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -226,10 +226,15 @@ void trace_init_file(const char *file)
#ifdef CONFIG_TRACE_SIMPLE
st_set_trace_file(file);
#elif defined CONFIG_TRACE_LOG
- /* If both the simple and the log backends are enabled, "--trace file"
- * only applies to the simple backend; use "-D" for the log backend.
+ /*
+ * If both the simple and the log backends are enabled, "--trace file"
+ * only applies to the simple backend; use "-D" for the log
+ * backend. However we should only override -D if we actually have
+ * something to override it with.
*/
- qemu_set_log_filename(file, &error_fatal);
+ if (file) {
+ qemu_set_log_filename(file, &error_fatal);
+ }
#else
if (file) {
fprintf(stderr, "error: --trace file=...: "
--
2.20.1
- [PULL 00/19] testing and plugin updates, Alex Bennée, 2020/02/26
- [PULL 01/19] tests/tcg: include a skip runner for pauth3 with plugins, Alex Bennée, 2020/02/26
- [PULL 02/19] tests/rcutorture: update usage hint, Alex Bennée, 2020/02/26
- [PULL 03/19] tests/rcutorture: better document locking of stats, Alex Bennée, 2020/02/26
- [PULL 04/19] tests/rcutorture: mild documenting refactor of update thread, Alex Bennée, 2020/02/26
- [PULL 05/19] travis.yml: Test the s390-ccw build, too, Alex Bennée, 2020/02/26
- [PULL 06/19] travis.yml: Fix Travis YAML configuration warnings, Alex Bennée, 2020/02/26
- [PULL 07/19] travis.yml: single-thread build-tcg stages, Alex Bennée, 2020/02/26
- [PULL 08/19] tests/iotests: be a little more forgiving on the size test, Alex Bennée, 2020/02/26
- [PULL 09/19] tracing: only allow -trace to override -D if set,
Alex Bennée <=
- [PULL 10/19] docs/devel: document query handle lifetimes, Alex Bennée, 2020/02/26
- [PULL 11/19] plugins/core: add missing break in cb_to_tcg_flags, Alex Bennée, 2020/02/26
- [PULL 12/19] tests/plugin: prevent uninitialized warning, Alex Bennée, 2020/02/26
- [PULL 13/19] qemu/bitops.h: Add extract8 and extract16, Alex Bennée, 2020/02/26
- [PULL 14/19] target/riscv: progressively load the instruction during decode, Alex Bennée, 2020/02/26
- [PULL 17/19] tcg: save vaddr temp for plugin usage, Alex Bennée, 2020/02/26
- [PULL 19/19] tests/tcg: take into account expected clashes pauth-4, Alex Bennée, 2020/02/26
- [PULL 15/19] tests/plugins: make howvec clean-up after itself., Alex Bennée, 2020/02/26
- [PULL 18/19] tests/tcg: fix typo in configure.sh test for v8.3, Alex Bennée, 2020/02/26
- [PULL 16/19] tests/tcg: give debug builds a little bit longer, Alex Bennée, 2020/02/26