From patchwork Thu Oct 29 20:44:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 538031 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 18FE3140187 for ; Fri, 30 Oct 2015 07:47:17 +1100 (AEDT) Received: from localhost ([::1]:46599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zru6N-0001dB-2o for incoming@patchwork.ozlabs.org; Thu, 29 Oct 2015 16:47:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zru3h-0005Ti-1E for qemu-devel@nongnu.org; Thu, 29 Oct 2015 16:44:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zru3c-0001H2-Uk for qemu-devel@nongnu.org; Thu, 29 Oct 2015 16:44:28 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:43354 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zru3c-0001GU-IC for qemu-devel@nongnu.org; Thu, 29 Oct 2015 16:44:24 -0400 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t9TKiIB2018999; Thu, 29 Oct 2015 23:44:21 +0300 (MSK) From: "Denis V. Lunev" To: Date: Thu, 29 Oct 2015 23:44:08 +0300 Message-Id: <1446151457-21157-3-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446151457-21157-1-git-send-email-den@openvz.org> References: <1446151457-21157-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: Paolo Bonzini , qemu-devel@nongnu.org, "Denis V. Lunev" Subject: [Qemu-devel] [PATCH 02/11] trace: split trace_init_events out of trace_init_backends X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Paolo Bonzini 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 --- qemu-io.c | 2 +- trace/control.c | 5 ++--- trace/control.h | 15 ++++++++++++--- vl.c | 8 ++++---- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index 269f17c..d6fa11b 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -440,7 +440,7 @@ int main(int argc, char **argv) } break; case 'T': - if (!trace_init_backends(optarg, NULL)) { + if (!trace_init_backends(optarg)) { exit(1); /* error message will have been printed */ } break; diff --git a/trace/control.c b/trace/control.c index 995beb3..ee5fbca 100644 --- a/trace/control.c +++ b/trace/control.c @@ -85,7 +85,7 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev) return NULL; } -static void trace_init_events(const char *fname) +void trace_init_events(const char *fname) { Location loc; FILE *fp; @@ -142,7 +142,7 @@ static void trace_init_events(const char *fname) loc_pop(&loc); } -bool trace_init_backends(const char *events, const char *file) +bool trace_init_backends(const char *file) { #ifdef CONFIG_TRACE_SIMPLE if (!st_init(file)) { @@ -164,6 +164,5 @@ bool trace_init_backends(const char *events, const char *file) } #endif - trace_init_events(events); return true; } diff --git a/trace/control.h b/trace/control.h index da9bb6b..bfbe560 100644 --- a/trace/control.h +++ b/trace/control.h @@ -150,8 +150,6 @@ static void trace_event_set_state_dynamic(TraceEvent *ev, bool state); /** * trace_init_backends: - * @events: Name of file with events to be enabled at startup; may be NULL. - * Corresponds to commandline option "-trace events=...". * @file: Name of trace output file; may be NULL. * Corresponds to commandline option "-trace file=...". * @@ -159,7 +157,18 @@ static void trace_event_set_state_dynamic(TraceEvent *ev, bool state); * * Returns: Whether the backends could be successfully initialized. */ -bool trace_init_backends(const char *events, const char *file); +bool trace_init_backends(const char *file); + +/** + * trace_init_events: + * @events: Name of file with events to be enabled at startup; may be NULL. + * Corresponds to commandline option "-trace events=...". + * + * Read the list of enabled tracing events. + * + * Returns: Whether the backends could be successfully initialized. + */ +void trace_init_events(const char *file); #include "trace/control-internal.h" diff --git a/vl.c b/vl.c index f5f7c3f..129177e 100644 --- a/vl.c +++ b/vl.c @@ -2961,7 +2961,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; @@ -3886,8 +3885,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: @@ -4084,7 +4084,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); } } @@ -4636,7 +4636,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); } }