build: convert xenoprof to Kconfig

Convert the xenoprof x86 build time option to Kconfig.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 434d9857898a3134a34ad03c8a152138b40fa93b..1bcb08b4620366ffe2c5961687b8278e4c05329d 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -3,7 +3,7 @@ subdir-y += cpu
 subdir-y += genapic
 subdir-y += hvm
 subdir-y += mm
-subdir-$(xenoprof) += oprofile
+subdir-$(CONFIG_XENOPROF) += oprofile
 subdir-y += x86_64
 
 obj-bin-y += alternative.init.o

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 94e4efd11230edae40436894a14014f5a93f23eb..14519e3930dae2156dcc9d7de9b5a83340f6302f 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -3,15 +3,12 @@
 
 HAS_NUMA := y
 HAS_CORE_PARKING := y
-xenoprof := y
 
 CFLAGS += -I$(BASEDIR)/include 
 CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
 CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
 CFLAGS += '-D__OBJECT_LABEL__=$(subst /,$$,$(subst -,_,$(subst $(BASEDIR)/,,$(CURDIR))/$@))'
 
-CFLAGS-$(xenoprof) += -DCONFIG_XENOPROF
-
 # Prevent floating-point variables from creeping into Xen.
 CFLAGS += -msoft-float
 

diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 6f404b452cd5944e54ebdeff7a1863e5bbee2b7f..49de7906596e7ad314dc2b4b2e399a15b419124a 100644 (file)
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -84,6 +84,19 @@ config LATE_HWDOM
 
          If unsure, say N.
 
+# Adds support for Xenoprof
+config XENOPROF
+       def_bool y
+       prompt "Xen Oprofile Support" if EXPERT = "y"
+       depends on X86
+       ---help---
+         Xen OProfile (Xenoprof) is a system-wide profiler for Xen virtual
+         machine environments, capable of profiling the Xen virtual machine
+         monitor, multiple Linux guest operating systems, and applications
+         running on them.
+
+         If unsure, say Y.
+
 # Enable/Disable XSM support
 config XSM
        bool "Xen Security Modules support"

diff --git a/xen/common/Makefile b/xen/common/Makefile
index 0d76efe42c0bc2a0a0395018f0c598b67fc8b2ac..57f4ed7642743534898ccef9b9bd56194a659ca1 100644 (file)
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -57,13 +57,13 @@ obj-y += vm_event.o
 obj-y += vmap.o
 obj-y += vsprintf.o
 obj-y += wait.o
+obj-$(CONFIG_XENOPROF) += xenoprof.o
 obj-y += xmalloc_tlsf.o
 
 obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo unlz4 earlycpio,$(n).init.o)
 
 obj-$(perfc)       += perfc.o
 obj-$(crash_debug) += gdbstub.o
-obj-$(xenoprof)    += xenoprof.o
 
 obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o kernel.o memory.o multicall.o tmem_xen.o xlat.o)