[PATCH 32/59] libperf: Move in perf_pmu__warn_invalid_config function

[Jiri Olsa <jolsa@redhat.com>]

Moving perf_pmu__warn_invalid_config function to libperf.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/lib/perf/include/internal/pmu.h |  2 ++
 tools/lib/perf/pmu.c                  | 34 +++++++++++++++++++++++++++
 tools/perf/util/pmu.c                 | 33 --------------------------
 tools/perf/util/pmu.h                 |  3 ---
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/tools/lib/perf/include/internal/pmu.h b/tools/lib/perf/include/internal/pmu.h
index b8a78e024f6d..49ae6b3813e6 100644
--- a/tools/lib/perf/include/internal/pmu.h
+++ b/tools/lib/perf/include/internal/pmu.h
@@ -54,4 +54,6 @@ void perf_pmu__set_format(unsigned long *bits, long from, long to);
 void perf_pmu_error(struct list_head *list, char *name, char const *msg);
 int perf_pmu__format_parse(char *dir, struct list_head *head);
 
+void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config,
+				   const char *name);
 #endif /* __LIBPERF_INTERNAL_PMU_H */
diff --git a/tools/lib/perf/pmu.c b/tools/lib/perf/pmu.c
index 2fa361516ca8..af7f1c44c914 100644
--- a/tools/lib/perf/pmu.c
+++ b/tools/lib/perf/pmu.c
@@ -10,6 +10,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <internal/pmu.h>
+#include "internal.h"
 
 extern FILE *perf_pmu_in;
 
@@ -81,3 +82,36 @@ int perf_pmu__format_parse(char *dir, struct list_head *head)
 	closedir(format_dir);
 	return ret;
 }
+
+void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config,
+				   const char *name)
+{
+	struct perf_pmu_format *format;
+	__u64 masks = 0, bits;
+	char buf[100];
+	unsigned int i;
+
+	list_for_each_entry(format, &pmu->format, list)	{
+		if (format->value != PERF_PMU_FORMAT_VALUE_CONFIG)
+			continue;
+
+		for_each_set_bit(i, format->bits, PERF_PMU_FORMAT_BITS)
+			masks |= 1ULL << i;
+	}
+
+	/*
+	 * Kernel doesn't export any valid format bits.
+	 */
+	if (masks == 0)
+		return;
+
+	bits = config & ~masks;
+	if (bits == 0)
+		return;
+
+	bitmap_scnprintf((unsigned long *)&bits, sizeof(bits) * 8, buf, sizeof(buf));
+
+	pr_warning("WARNING: event '%s' not valid (bits %s of config "
+		   "'%llx' not supported by kernel)!\n",
+		   name ?: "N/A", buf, config);
+}
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 5bda7796f91a..920f2df52b6d 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -1846,39 +1846,6 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu)
 	return nr_caps;
 }
 
-void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config,
-				   const char *name)
-{
-	struct perf_pmu_format *format;
-	__u64 masks = 0, bits;
-	char buf[100];
-	unsigned int i;
-
-	list_for_each_entry(format, &pmu->format, list)	{
-		if (format->value != PERF_PMU_FORMAT_VALUE_CONFIG)
-			continue;
-
-		for_each_set_bit(i, format->bits, PERF_PMU_FORMAT_BITS)
-			masks |= 1ULL << i;
-	}
-
-	/*
-	 * Kernel doesn't export any valid format bits.
-	 */
-	if (masks == 0)
-		return;
-
-	bits = config & ~masks;
-	if (bits == 0)
-		return;
-
-	bitmap_scnprintf((unsigned long *)&bits, sizeof(bits) * 8, buf, sizeof(buf));
-
-	pr_warning("WARNING: event '%s' not valid (bits %s of config "
-		   "'%llx' not supported by kernel)!\n",
-		   name ?: "N/A", buf, config);
-}
-
 bool perf_pmu__has_hybrid(void)
 {
 	if (!hybrid_scanned) {
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 091f49a655f8..077dbbdccb95 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -96,9 +96,6 @@ int perf_pmu__convert_scale(const char *scale, char **end, double *sval);
 
 int perf_pmu__caps_parse(struct perf_pmu *pmu);
 
-void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config,
-				   const char *name);
-
 bool perf_pmu__has_hybrid(void);
 int perf_pmu__match(char *pattern, char *name, char *tok);
 
-- 
2.31.1