diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-11 19:53:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-11 19:53:15 +0000 |
| commit | a4c141dca466ed3e9451f147efe6304b1b659ff5 (patch) | |
| tree | 2a24d0b0ef53d82cff2e2169aec13abc748cfcc3 /softmmu | |
| parent | 46d407f84a437f2cbd4afb2f3d23d685448ba272 (diff) | |
| parent | 35e28cb0f210cae3d9c98113d519fe5a4bef5866 (diff) | |
| download | qemu-a4c141dca466ed3e9451f147efe6304b1b659ff5.zip qemu-a4c141dca466ed3e9451f147efe6304b1b659ff5.tar.gz qemu-a4c141dca466ed3e9451f147efe6304b1b659ff5.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/tracing-pull-request' into staging
Tracing pull request
# gpg: Signature made Wed 11 Nov 2020 15:56:18 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:
scripts/tracetool: silence SystemTap dtrace(1) long long warnings
trace: remove argument from trace_init_file
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'softmmu')
| -rw-r--r-- | softmmu/vl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index e32fd48..e6e0ad5 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2887,7 +2887,6 @@ void qemu_init(int argc, char **argv, char **envp) int display_remote = 0; const char *log_mask = NULL; const char *log_file = NULL; - char *trace_file = NULL; ram_addr_t maxram_size; uint64_t ram_slots = 0; FILE *vmstate_dump_file = NULL; @@ -3689,8 +3688,7 @@ void qemu_init(int argc, char **argv, char **envp) xen_domid_restrict = true; break; case QEMU_OPTION_trace: - g_free(trace_file); - trace_file = trace_opt_parse(optarg); + trace_opt_parse(optarg); break; case QEMU_OPTION_plugin: qemu_plugin_opt_parse(optarg, &plugin_list); @@ -3940,7 +3938,7 @@ void qemu_init(int argc, char **argv, char **envp) if (!trace_init_backends()) { exit(1); } - trace_init_file(trace_file); + trace_init_file(); /* Open the logfile at this point and set the log mask if necessary. */ |