From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu1Qe-0007mY-Qc for qemu-devel@nongnu.org; Mon, 09 Jun 2014 11:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wu1QY-0007Cr-Qn for qemu-devel@nongnu.org; Mon, 09 Jun 2014 11:24:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu1QY-0007Bz-IL for qemu-devel@nongnu.org; Mon, 09 Jun 2014 11:24:02 -0400 From: Stefan Hajnoczi Date: Mon, 9 Jun 2014 17:23:47 +0200 Message-Id: <1402327429-20941-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1402327429-20941-1-git-send-email-stefanha@redhat.com> References: <1402327429-20941-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 3/5] trace: Replace error with warning if event is not defined List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Peter Maydell , Stefan Hajnoczi From: Alexey Kardashevskiy At the moment QEMU exits if trace point is not defined which makes a developer life harder if he has to switch between branches with different traces implemented. This replaces error+exit wit WARNING if the tracepoint does not exist or not traceable. Signed-off-by: Alexey Kardashevskiy Signed-off-by: Stefan Hajnoczi --- trace/control.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/trace/control.c b/trace/control.c index 49f61e1..4aa02cf 100644 --- a/trace/control.c +++ b/trace/control.c @@ -112,15 +112,15 @@ void trace_backend_init_events(const char *fname) TraceEvent *ev = trace_event_name(line_ptr); if (ev == NULL) { fprintf(stderr, - "error: trace event '%s' does not exist\n", line_ptr); - exit(1); - } - if (!trace_event_get_state_static(ev)) { + "WARNING: trace event '%s' does not exist\n", + line_ptr); + } else if (!trace_event_get_state_static(ev)) { fprintf(stderr, - "error: trace event '%s' is not traceable\n", line_ptr); - exit(1); + "WARNING: trace event '%s' is not traceable\n", + line_ptr); + } else { + trace_event_set_state_dynamic(ev, enable); } - trace_event_set_state_dynamic(ev, enable); } } } -- 1.9.3