[PATCH v2 1/3] tools/perf: Move kvm-stat header file from conditional inclusion to common include section

From: Anju T Sudhakar
Date: Thu Jul 18 2019 - 14:18:07 EST


Move kvm-stat header file to the common include section, and make the
definitions in the header file under the conditional inclusion
`#ifdef HAVE_KVM_STAT_SUPPORT`.

This helps to define other perf kvm related function prototypes in
kvm-stat header file, which may not need kvm-stat support.

Signed-off-by: Anju T Sudhakar <anju@xxxxxxxxxxxxxxxxxx>
---
tools/perf/builtin-kvm.c | 2 +-
tools/perf/util/kvm-stat.h | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index b33c83489120..5d2b34d290a3 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -19,6 +19,7 @@
#include "util/top.h"
#include "util/data.h"
#include "util/ordered-events.h"
+#include "util/kvm-stat.h"

#include <sys/prctl.h>
#ifdef HAVE_TIMERFD_SUPPORT
@@ -55,7 +56,6 @@ static const char *get_filename_for_perf_kvm(void)
}

#ifdef HAVE_KVM_STAT_SUPPORT
-#include "util/kvm-stat.h"

void exit_event_get_key(struct perf_evsel *evsel,
struct perf_sample *sample,
diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h
index 1403dec189b4..b3b2670e1a2b 100644
--- a/tools/perf/util/kvm-stat.h
+++ b/tools/perf/util/kvm-stat.h
@@ -2,6 +2,8 @@
#ifndef __PERF_KVM_STAT_H
#define __PERF_KVM_STAT_H

+#ifdef HAVE_KVM_STAT_SUPPORT
+
#include "../perf.h"
#include "tool.h"
#include "stat.h"
@@ -144,5 +146,6 @@ extern const int decode_str_len;
extern const char *kvm_exit_reason;
extern const char *kvm_entry_trace;
extern const char *kvm_exit_trace;
+#endif /* HAVE_KVM_STAT_SUPPORT */

#endif /* __PERF_KVM_STAT_H */
--
2.20.1