Skip to contentSkip to conversation

perf kvm: Fix powerpc build

PATCH In review Ian Rogers 2 participants 2 messages May 30, 2023 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf kvm: Fix powerpc build

Missed function rename from pmu_have_event to perf_pmus__have_event.

Fixes 1eaf496ed386 ("perf pmu: Separate pmu and pmus")
---
 tools/perf/arch/powerpc/util/kvm-stat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/arch/powerpc/util/kvm-stat.c +1 -1
index ea1220d66b67..1039e15c27c9 100644
@@ -204,7 +204,7 @@ int kvm_add_default_arch_event(int *argc, const char **argv)
 
 	parse_options(j, tmp, event_options, NULL, PARSE_OPT_KEEP_UNKNOWN);
 	if (!event) {
-		if (pmu_have_event("trace_imc", "trace_cycles")) {
+		if (perf_pmus__have_event("trace_imc", "trace_cycles")) {
 			argv[j++] = strdup("-e");
 			argv[j++] = strdup("trace_imc/trace_cycles/");
 			*argc += 2;
Signature · 1 line
2.41.0.rc0.172.g3f132b7071-goog
#1 lore raw

Em Mon, May 29, 2023 at 07:14:33PM -0700, Ian Rogers escreveu:

Quoted 8 lines

Missed function rename from pmu_have_event to perf_pmus__have_event.

Fixes 1eaf496ed386 ("perf pmu: Separate pmu and pmus")
---
 tools/perf/arch/powerpc/util/kvm-stat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[acme@quaco perf-tools-next]$ grep perf_pmus__have_event tools/perf/util/*.h tools/perf/util/pmus.h:bool perf_pmus__have_event(const char *pname, const char *name); [acme@quaco perf-tools-next]$ vim tools/perf/arch/powerpc/util/kvm-stat.c [acme@quaco perf-tools-next]$ grep -w perf_pmus__have_event tools/perf/util/*.h tools/perf/util/pmus.h:bool perf_pmus__have_event(const char *pname, const char *name); [acme@quaco perf-tools-next]$ grep -w perf_pmus__have_event tools/perf/arch/powerpc/util/kvm-stat.c

		if (perf_pmus__have_event("trace_imc", "trace_cycles")) {

[acme@quaco perf-tools-next]$ grep util\/pmus.h tools/perf/arch/powerpc/util/kvm-stat.c [acme@quaco perf-tools-next]$

I'm adding the missing explicit:

#include "util/pmus.h"

to tools/perf/arch/powerpc/util/kvm-stat.c, ok?

Also removing the now needless util/pmu.h include.

Thanks,

- Arnaldo

Quoted 16 lines
tools/perf/arch/powerpc/util/kvm-stat.c +1 -1
index ea1220d66b67..1039e15c27c9 100644
@@ -204,7 +204,7 @@ int kvm_add_default_arch_event(int *argc, const char **argv)
 
 	parse_options(j, tmp, event_options, NULL, PARSE_OPT_KEEP_UNKNOWN);
 	if (!event) {
-		if (pmu_have_event("trace_imc", "trace_cycles")) {
+		if (perf_pmus__have_event("trace_imc", "trace_cycles")) {
 			argv[j++] = strdup("-e");
 			argv[j++] = strdup("trace_imc/trace_cycles/");
 			*argc += 2;
Signature · 1 line
2.41.0.rc0.172.g3f132b7071-goog
Signature · 1 line
- Arnaldo