From 5c657eb616b5a26f9b6cc038c44ea3b72dfb5d8f Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Fri, 26 Oct 2012 13:30:06 -0700 Subject: [PATCH] --- yaml --- r: 338913 b: refs/heads/master c: 9175ce1f1244edd9f4d39605aa06ce5b0a50b8e0 h: refs/heads/master i: 338911: c8644c38c34d6f1c34c980a41acbe6df6e55690b v: v3 --- [refs] | 2 +- trunk/tools/perf/util/parse-events.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f496cc3e464b..f0427f637d70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9db55064940db1447976945d07402a923e818962 +refs/heads/master: 9175ce1f1244edd9f4d39605aa06ce5b0a50b8e0 diff --git a/trunk/tools/perf/util/parse-events.c b/trunk/tools/perf/util/parse-events.c index 3a3efcf3e4e9..c0b785b50849 100644 --- a/trunk/tools/perf/util/parse-events.c +++ b/trunk/tools/perf/util/parse-events.c @@ -827,8 +827,6 @@ int parse_events(struct perf_evlist *evlist, const char *str, * Both call perf_evlist__delete in case of error, so we dont * need to bother. */ - fprintf(stderr, "invalid or unsupported event: '%s'\n", str); - fprintf(stderr, "Run 'perf list' for a list of valid events\n"); return ret; } @@ -836,7 +834,13 @@ int parse_events_option(const struct option *opt, const char *str, int unset __maybe_unused) { struct perf_evlist *evlist = *(struct perf_evlist **)opt->value; - return parse_events(evlist, str, unset); + int ret = parse_events(evlist, str, unset); + + if (ret) { + fprintf(stderr, "invalid or unsupported event: '%s'\n", str); + fprintf(stderr, "Run 'perf list' for a list of valid events\n"); + } + return ret; } int parse_filter(const struct option *opt, const char *str,