Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da50ad69 authored by Alexander Yarygin's avatar Alexander Yarygin Committed by Arnaldo Carvalho de Melo
Browse files

perf kvm: Introduce HAVE_KVM_STAT_SUPPORT flag 



kvm stat support is currently conditional on i386/x86_64. Let's abstract
this into a HAVE_KVM_STAT_SUPPORT flag, so that other architectures can
support kvm stat as well.

Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarAlexander Yarygin <yarygin@linux.vnet.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1404395992-17095-2-git-send-email-yarygin@linux.vnet.ibm.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1561880d

tools/perf/arch/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ endif 
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o

LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/tsc.o

LIB_H += arch/$(ARCH)/util/tsc.h

HAVE_KVM_STAT_SUPPORT := 1

tools/perf/builtin-kvm.c

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <pthread.h>

#include <math.h>



#if defined(__i386__) || defined(__x86_64__)

#ifdef HAVE_KVM_STAT_SUPPORT

#include <asm/svm.h>

#include <asm/vmx.h>

#include <asm/kvm.h>
@@ -1609,7 +1609,7 @@ static int kvm_cmd_stat(const char *file_name, int argc, const char **argv) 
perf_stat:

	return cmd_stat(argc, argv, NULL);

}

#endif

#endif /* HAVE_KVM_STAT_SUPPORT */



static int __cmd_record(const char *file_name, int argc, const char **argv)

{
@@ -1726,7 +1726,7 @@ int cmd_kvm(int argc, const char **argv, const char *prefix __maybe_unused) 
		return cmd_top(argc, argv, NULL);

	else if (!strncmp(argv[0], "buildid-list", 12))

		return __cmd_buildid_list(file_name, argc, argv);

#if defined(__i386__) || defined(__x86_64__)

#ifdef HAVE_KVM_STAT_SUPPORT

	else if (!strncmp(argv[0], "stat", 4))

		return kvm_cmd_stat(file_name, argc, argv);

#endif

tools/perf/config/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -594,6 +594,10 @@ ifndef NO_LIBNUMA 
  endif

endif



ifdef HAVE_KVM_STAT_SUPPORT

    CFLAGS += -DHAVE_KVM_STAT_SUPPORT

endif



# Among the variables below, these:

#   perfexecdir

#   template_dir