diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2016-01-07 16:55:23 +0300 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-02-03 09:19:09 +0000 |
commit | 45bd0b41bdbf554e49fb510673309164c513a8c8 (patch) | |
tree | a2db17385a9b1175d0352655c1c6a1ec0498bac5 /vl.c | |
parent | 52449a314e100e2db990ab9a156bb0173017f28d (diff) | |
download | qemu-45bd0b41bdbf554e49fb510673309164c513a8c8.zip qemu-45bd0b41bdbf554e49fb510673309164c513a8c8.tar.gz qemu-45bd0b41bdbf554e49fb510673309164c513a8c8.tar.bz2 |
trace: split trace_init_events out of trace_init_backends
This is cleaner and has two advantages. First, it improves error
reporting with -daemonize. Second, multiple "-trace events" options
now cumulate.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-id: 1452174932-28657-3-git-send-email-den@openvz.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -2988,7 +2988,6 @@ int main(int argc, char **argv, char **envp) bool userconfig = true; const char *log_mask = NULL; const char *log_file = NULL; - const char *trace_events = NULL; const char *trace_file = NULL; ram_addr_t maxram_size; uint64_t ram_slots = 0; @@ -3905,8 +3904,9 @@ int main(int argc, char **argv, char **envp) if (!opts) { exit(1); } - trace_events = qemu_opt_get(opts, "events"); + trace_init_events(qemu_opt_get(opts, "events")); trace_file = qemu_opt_get(opts, "file"); + qemu_opts_del(opts); break; } case QEMU_OPTION_readconfig: @@ -4106,7 +4106,7 @@ int main(int argc, char **argv, char **envp) } if (!is_daemonized()) { - if (!trace_init_backends(trace_events, trace_file)) { + if (!trace_init_backends(trace_file)) { exit(1); } } @@ -4653,7 +4653,7 @@ int main(int argc, char **argv, char **envp) os_setup_post(); if (is_daemonized()) { - if (!trace_init_backends(trace_events, trace_file)) { + if (!trace_init_backends(trace_file)) { exit(1); } } |