3 files changed, 17 insertions, 12 deletions

diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 5a47c1e11f77..559eeb42c5e7 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -59,13 +59,13 @@ const char *default_search_path[NR_SEARCH_PATH] = {
 static struct {
         char *vmlinux;
         char *release;
-        int need_dwarf;
+        bool need_dwarf;
+        bool list_events;
         int nr_probe;
         struct probe_point probes[MAX_PROBES];
         struct strlist *dellist;
 } session;
 
-static bool listing;
 
 /* Parse an event definition. Note that any error must die. */
 static void parse_probe_event(const char *str)
@@ -77,7 +77,7 @@ static void parse_probe_event(const char *str)
                 die("Too many probes (> %d) are specified.", MAX_PROBES);
 
         /* Parse perf-probe event into probe_point */
-        session.need_dwarf = parse_perf_probe_event(str, pp);
+        parse_perf_probe_event(str, pp, &session.need_dwarf);
 
         pr_debug("%d arguments\n", pp->nr_args);
 }
@@ -166,7 +166,8 @@ static const struct option options[] = {
         OPT_STRING('k', "vmlinux", &session.vmlinux, "file",
                 "vmlinux/module pathname"),
 #endif
-        OPT_BOOLEAN('l', "list", &listing, "list up current probe events"),
+        OPT_BOOLEAN('l', "list", &session.list_events,
+                    "list up current probe events"),
         OPT_CALLBACK('d', "del", NULL, "[GROUP:]EVENT", "delete a probe event.",
                 opt_del_probe_event),
         OPT_CALLBACK('a', "add", NULL,
@@ -207,10 +208,10 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
         if (argc > 0)
                 parse_probe_event_argv(argc, argv);
 
-        if ((session.nr_probe == 0 && !session.dellist && !listing))
+        if ((!session.nr_probe && !session.dellist && !session.list_events))
                 usage_with_options(probe_usage, options);
 
-        if (listing) {
+        if (session.list_events) {
                 if (session.nr_probe != 0 || session.dellist) {
                         pr_warning("  Error: Don't use --list with"
                                    " --add/--del.\n");
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index d14a4585bcaf..add379c55c36 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -150,10 +150,13 @@ static void parse_perf_probe_probepoint(char *arg, struct probe_point *pp)
 }
 
 /* Parse perf-probe event definition */
-int parse_perf_probe_event(const char *str, struct probe_point *pp)
+void parse_perf_probe_event(const char *str, struct probe_point *pp,
+                            bool *need_dwarf)
 {
         char **argv;
-        int argc, i, need_dwarf = 0;
+        int argc, i;
+
+        *need_dwarf = false;
 
         argv = argv_split(str, &argc);
         if (!argv)
@@ -164,7 +167,7 @@ int parse_perf_probe_event(const char *str, struct probe_point *pp)
         /* Parse probe point */
         parse_perf_probe_probepoint(argv[0], pp);
         if (pp->file || pp->line)
-                need_dwarf = 1;
+                *need_dwarf = true;
 
         /* Copy arguments and ensure return probe has no C argument */
         pp->nr_args = argc - 1;
@@ -177,12 +180,11 @@ int parse_perf_probe_event(const char *str, struct probe_point *pp)
                         if (pp->retprobe)
                                 semantic_error("You can't specify local"
                                                 " variable for kretprobe");
-                        need_dwarf = 1;
+                        *need_dwarf = true;
                 }
         }
 
         argv_free(argv);
-        return need_dwarf;
 }
 
 /* Parse kprobe_events event into struct probe_point */
diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h
index f752159124ae..028575b5fc3b 100644
--- a/tools/perf/util/probe-event.h
+++ b/tools/perf/util/probe-event.h
@@ -1,10 +1,12 @@
 #ifndef _PROBE_EVENT_H
 #define _PROBE_EVENT_H
 
+#include <stdbool.h>
 #include "probe-finder.h"
 #include "strlist.h"
 
-extern int parse_perf_probe_event(const char *str, struct probe_point *pp);
+extern void parse_perf_probe_event(const char *str, struct probe_point *pp,
+                                   bool *need_dwarf);
 extern int synthesize_perf_probe_event(struct probe_point *pp);
 extern void parse_trace_kprobe_event(const char *str, char **group,
                                      char **event, struct probe_point *pp);