1 files changed, 27 insertions, 26 deletions

diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid-list.c
index cb690a65bf0..52480467e9f 100644
--- a/tools/perf/builtin-buildid-list.c
+++ b/tools/perf/builtin-buildid-list.c
@@ -18,7 +18,7 @@
 
 #include <libelf.h>
 
-static char const *input_name = "perf.data";
+static const char *input_name;
 static bool force;
 static bool show_kernel;
 static bool with_hits;
@@ -39,24 +39,6 @@ static const struct option options[] = {
         OPT_END()
 };
 
-static int perf_session__list_build_ids(void)
-{
-        struct perf_session *session;
-
-        session = perf_session__new(input_name, O_RDONLY, force, false,
-                                    &build_id__mark_dso_hit_ops);
-        if (session == NULL)
-                return -1;
-
-        if (with_hits)
-                perf_session__process_events(session, &build_id__mark_dso_hit_ops);
-
-        perf_session__fprintf_dsos_buildid(session, stdout, with_hits);
-
-        perf_session__delete(session);
-        return 0;
-}
-
 static int sysfs__fprintf_build_id(FILE *fp)
 {
         u8 kallsyms_build_id[BUILD_ID_SIZE];
@@ -85,17 +67,36 @@ static int filename__fprintf_build_id(const char *name, FILE *fp)
         return fprintf(fp, "%s\n", sbuild_id);
 }
 
-static int __cmd_buildid_list(void)
+static int perf_session__list_build_ids(void)
 {
-        if (show_kernel)
-                return sysfs__fprintf_build_id(stdout);
+        struct perf_session *session;
 
         elf_version(EV_CURRENT);
+
+        session = perf_session__new(input_name, O_RDONLY, force, false,
+                                    &build_id__mark_dso_hit_ops);
+        if (session == NULL)
+                return -1;
+
         /*
-         * See if this is an ELF file first:
-         */
-        if (filename__fprintf_build_id(input_name, stdout))
-                return 0;
+         * See if this is an ELF file first:
+         */
+        if (filename__fprintf_build_id(session->filename, stdout))
+                goto out;
+
+        if (with_hits)
+                perf_session__process_events(session, &build_id__mark_dso_hit_ops);
+
+        perf_session__fprintf_dsos_buildid(session, stdout, with_hits);
+out:
+        perf_session__delete(session);
+        return 0;
+}
+
+static int __cmd_buildid_list(void)
+{
+        if (show_kernel)
+                return sysfs__fprintf_build_id(stdout);
 
         return perf_session__list_build_ids();
 }