From 45bd0b41bdbf554e49fb510673309164c513a8c8 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 7 Jan 2016 16:55:23 +0300 Subject: 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 Signed-off-by: Denis V. Lunev Acked-by: Christian Borntraeger Message-id: 1452174932-28657-3-git-send-email-den@openvz.org Signed-off-by: Stefan Hajnoczi --- vl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vl.c') diff --git a/vl.c b/vl.c index f043009f67..ff2a7d5aed 100644 --- a/vl.c +++ b/vl.c @@ -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); } } -- cgit v1.2.3