diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-27 11:28:46 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-27 11:28:46 +0000 |
| commit | 4a74626970ab4ea475263d155b10fb75c9af0b33 (patch) | |
| tree | 915c4b00ddbdb0803fb58226f87ec21efe8ac977 | |
| parent | d55450df995d6223486db11c66491cbf6c131523 (diff) | |
| parent | ee8041013a574b4f88e05472f321e50e1f4be733 (diff) | |
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/tracing-pull-request' into staging
Pull request
v2:
* Fix Anthony Perard's email address [Philippe]
# gpg: Signature made Mon 26 Oct 2020 17:04:57 GMT
# gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha-gitlab/tags/tracing-pull-request:
Add execute bit back to scripts/tracetool.py
trace/simple: Enable tracing on startup only if the user specifies a trace option
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x[-rw-r--r--] | scripts/tracetool.py | 0 | ||||
| -rw-r--r-- | trace/control.c | 6 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 31146242b7..31146242b7 100644..100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py diff --git a/trace/control.c b/trace/control.c index b35e512dce..5669db7eea 100644 --- a/trace/control.c +++ b/trace/control.c @@ -39,6 +39,7 @@ static TraceEventGroup *event_groups; static size_t nevent_groups; static uint32_t next_id; static uint32_t next_vcpu_id; +static bool init_trace_on_startup; QemuOptsList qemu_trace_opts = { .name = "trace", @@ -225,7 +226,9 @@ void trace_init_file(const char *file) { #ifdef CONFIG_TRACE_SIMPLE st_set_trace_file(file); - st_set_trace_file_enabled(true); + if (init_trace_on_startup) { + st_set_trace_file_enabled(true); + } #elif defined CONFIG_TRACE_LOG /* * If both the simple and the log backends are enabled, "--trace file" @@ -299,6 +302,7 @@ char *trace_opt_parse(const char *optarg) } trace_init_events(qemu_opt_get(opts, "events")); trace_file = g_strdup(qemu_opt_get(opts, "file")); + init_trace_on_startup = true; qemu_opts_del(opts); return trace_file; |