perf probe: Fix multiple --vars options behavior

Fix a bug that perf-probe fails to initialize libdwfl and shows incorrect error
when user gives multiple --vars options.

Cc: [email protected]
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Lin Ming <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <20110330092553[email protected]>
Signed-off-by: Masami Hiramatsu <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index a372d748644bc643a475978fbbef5332fd3e991f..f0223166e76165cd1e25d86cade2d7bb8337c9c6 100644 (file)
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -510,18 +510,18 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,
        if (ret < 0)
                return ret;
 
-       fd = open_vmlinux(module);
-       if (fd < 0) {
-               pr_warning("Failed to open debug information file.\n");
-               return fd;
-       }
-
        setup_pager();
 
-       for (i = 0; i < npevs && ret >= 0; i++)
+       for (i = 0; i < npevs && ret >= 0; i++) {
+               fd = open_vmlinux(module);
+               if (fd < 0) {
+                       pr_warning("Failed to open debug information file.\n");
+                       ret = fd;
+                       break;
+               }
                ret = show_available_vars_at(fd, &pevs[i], max_vls, _filter,
                                             externs);
-
+       }
        return ret;
 }