perf kvm: Make function only used by 'perf kvm' static

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Apr 24, 2017 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-04-24 21:10 UTC #0 lore raw

Commit-ID:  bb8c16db43e48f2012c3ae8c7d682f834c5986d9
Gitweb:     http://git.kernel.org/tip/bb8c16db43e48f2012c3ae8c7d682f834c5986d9
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 19 Apr 2017 16:15:13 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 24 Apr 2017 12:33:26 -0300

perf kvm: Make function only used by 'perf kvm' static

No need to have this polluting util.h, it was polluted enough already.

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/builtin-kvm.c | 14 ++++++++++++++
 tools/perf/util/util.c   | 14 --------------
 tools/perf/util/util.h   |  1 -
 3 files changed, 14 insertions(+), 15 deletions(-)

tools/perf/builtin-kvm.c +14 -0

index d86ac0a..129af3e 100644
@@ -36,6 +36,20 @@
 #include <pthread.h>
 #include <math.h>
 
+static const char *get_filename_for_perf_kvm(void)
+{
+	const char *filename;
+
+	if (perf_host && !perf_guest)
+		filename = strdup("perf.data.host");
+	else if (!perf_host && perf_guest)
+		filename = strdup("perf.data.guest");
+	else
+		filename = strdup("perf.data.kvm");
+
+	return filename;
+}
+
 #ifdef HAVE_KVM_STAT_SUPPORT
 #include "util/kvm-stat.h"

tools/perf/util/util.c +0 ~~-14~~

index e86dba2..eb49330 100644
@@ -496,20 +496,6 @@ int parse_callchain_record(const char *arg, struct callchain_param *param)
 	return ret;
 }
 
-const char *get_filename_for_perf_kvm(void)
-{
-	const char *filename;
-
-	if (perf_host && !perf_guest)
-		filename = strdup("perf.data.host");
-	else if (!perf_host && perf_guest)
-		filename = strdup("perf.data.guest");
-	else
-		filename = strdup("perf.data.kvm");
-
-	return filename;
-}
-
 int perf_event_paranoid(void)
 {
 	int value;

tools/perf/util/util.h +0 -1

index dc8eb94..c3f6d0d 100644
@@ -100,7 +100,6 @@ int perf_event_paranoid(void);
 void mem_bswap_64(void *src, int byte_size);
 void mem_bswap_32(void *src, int byte_size);
 
-const char *get_filename_for_perf_kvm(void);
 bool find_process(const char *name);
 
 #ifdef HAVE_ZLIB_SUPPORT