perf kvm: Move kvm-stat header file from conditional inclusion to common include section (8067b3da) · Commits · 戴 / test

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@linux.vnet.ibm.com> Reviewed-By:

Ravi Bangoria <ravi.bangoria@linux.ibm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: linuxppc-dev@lists.ozlabs.org Link: http://lore.kernel.org/lkml/20190718181749.30612-1-anju@linux.vnet.ibm.com Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/builtin-kvm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@
	#include "util/top.h"		#include "util/top.h"
	#include "util/data.h"		#include "util/data.h"
	#include "util/ordered-events.h"		#include "util/ordered-events.h"
			#include "util/kvm-stat.h"
	#include "ui/ui.h"		#include "ui/ui.h"

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

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

	void exit_event_get_key(struct evsel *evsel,		void exit_event_get_key(struct evsel *evsel,
	struct perf_sample *sample,		struct perf_sample *sample,

tools/perf/util/kvm-stat.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,8 @@
	#ifndef __PERF_KVM_STAT_H		#ifndef __PERF_KVM_STAT_H
	#define __PERF_KVM_STAT_H		#define __PERF_KVM_STAT_H

			#ifdef HAVE_KVM_STAT_SUPPORT

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

	#endif /* __PERF_KVM_STAT_H */		#endif /* __PERF_KVM_STAT_H */

Admin message