Ramkumar reported that perf list --raw-dump was broken by 44d742e. Fix by making raw-dump a proper argument.
Signed-off-by: Ramkumar Ramachandra <artag...@gmail.com> Signed-off-by: Dongsheng Yang <yangds.f...@cn.fujitsu.com> --- Changelog: Remove "Signed-off-by: David Ahern" in commit message. tools/perf/builtin-list.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index 1aac451..9cf98f4 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -19,8 +19,10 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) { int i; + bool raw_dump = false; unsigned int count = 0; const struct option list_options[] = { + OPT_BOOLEAN(0, "raw-dump", &raw_dump, "raw dump for completion"), OPT_END() }; const char * const list_usage[] = { @@ -34,7 +36,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) setup_pager(); if (argc == 0) { - print_events(NULL, false); + print_events(NULL, raw_dump); return 0; } @@ -42,26 +44,24 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) if (i) putchar('\n'); if (strncmp(argv[i], "tracepoint", 10) == 0) - count += print_tracepoint_events(NULL, NULL, false); + count += print_tracepoint_events(NULL, NULL, raw_dump); else if (strcmp(argv[i], "hw") == 0 || strcmp(argv[i], "hardware") == 0) - count += print_events_type(PERF_TYPE_HARDWARE); + count += print_events_type(PERF_TYPE_HARDWARE, raw_dump); else if (strcmp(argv[i], "sw") == 0 || strcmp(argv[i], "software") == 0) - count += print_events_type(PERF_TYPE_SOFTWARE); + count += print_events_type(PERF_TYPE_SOFTWARE, raw_dump); else if (strcmp(argv[i], "cache") == 0 || strcmp(argv[i], "hwcache") == 0) - count += print_hwcache_events(NULL, false); + count += print_hwcache_events(NULL, raw_dump); else if (strcmp(argv[i], "pmu") == 0) - count += print_pmu_events(NULL, false); - else if (strcmp(argv[i], "--raw-dump") == 0) - count += print_events(NULL, true); + count += print_pmu_events(NULL, raw_dump); else { char *sep = strchr(argv[i], ':'), *s; int sep_idx; if (sep == NULL) { - if(!(count += print_events(argv[i], false))) + if(!(count += print_events(argv[i], raw_dump))) goto err_out; continue; } @@ -71,7 +71,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) return -1; s[sep_idx] = '\0'; - if (!(count += print_tracepoint_events(s, s + sep_idx + 1, false))) + if (!(count += print_tracepoint_events(s, s + sep_idx + 1, raw_dump))) goto err_out; free(s); } -- 1.8.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/