build: convert HAS_KEXEC / KEXEC use to Kconfig

Use the Kconfig generated CONFIG_HAS_KEXEC defines in the build system
and replace kexec :=y in Rules.mk with a kconfig option called
CONFIG_KEXEC. Purposefully did not merge the two variables together in
this patch to keep this as mechanical as possible.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/Rules.mk b/xen/Rules.mk
index d55c58c2910b77dd457e56efa6cad4e3f5354932..4ed0d11b118d81859d07fabbc4fcf8373cce688a 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -10,7 +10,6 @@ lock_profile  ?= n
 crash_debug   ?= n
 frame_pointer ?= n
 lto           ?= n
-kexec         ?= y
 
 -include $(BASEDIR)/include/config/auto.conf
 
@@ -28,6 +27,10 @@ ifeq ($(perfc_arrays),y)
 perfc := y
 endif
 
+ifneq ($(origin kexec),undefined)
+$(error "You must use 'make menuconfig' to enable/disable kexec now.")
+endif
+
 # Set ARCH/SUBARCH appropriately.
 override TARGET_SUBARCH  := $(XEN_TARGET_ARCH)
 override TARGET_ARCH     := $(shell echo $(XEN_TARGET_ARCH) | \
@@ -68,11 +71,6 @@ ifneq ($(max_phys_irqs),)
 CFLAGS-y                += -DMAX_PHYS_IRQS=$(max_phys_irqs)
 endif
 
-CONFIG_KEXEC-$(HAS_KEXEC) := $(kexec)
-CONFIG_KEXEC              := $(CONFIG_KEXEC-y)
-
-CFLAGS-$(CONFIG_KEXEC)  += -DCONFIG_KEXEC
-
 AFLAGS-y                += -D__ASSEMBLY__ -include $(BASEDIR)/include/xen/config.h
 
 # Clang's built-in assembler can't handle .code16/.code32/.code64 yet

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index d472234f81b32677a281f5ae5a39e5f158204caa..88955e7030ed3eacef03f362405f31c3b7dea908 100644 (file)
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -7,6 +7,7 @@ config X86
        select HAS_CPUFREQ
        select HAS_GDBSX
        select HAS_IOPORTS
+       select HAS_KEXEC
        select HAS_NS16550
        select HAS_PASSTHROUGH
        select HAS_PCI

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 568fa97b85f622e14f1b204d66c3b55647447b45..c27e0d6c7fbdc226c66d9e222f6d2749b458f3bb 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -3,7 +3,6 @@
 
 HAS_NUMA := y
 HAS_EHCI := y
-HAS_KEXEC := y
 HAS_CORE_PARKING := y
 xenoprof := y
 

diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 490557468347cec47bc61ec8c27d4eb4dfbb4cee..8d2ab4f348747b7b8283e07bc58f7a190e9ba837 100644 (file)
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -9,6 +9,10 @@ config HAS_DEVICE_TREE
 config HAS_PDX
        bool
 
+# Select HAS_KEXEC if kexec is supported
+config HAS_KEXEC
+       bool
+
 # Select HAS_GDBSX if GDBSX is supported
 config HAS_GDBSX
        bool
@@ -16,4 +20,16 @@ config HAS_GDBSX
 config HAS_IOPORTS
        bool
 
+# Enable/Disable kexec support
+config KEXEC
+       bool "kexec support"
+       default y
+       depends on HAS_KEXEC
+       ---help---
+         Allows a running Xen hypervisor to be replaced with another OS
+         without rebooting. This is primarily used to execute a crash
+         environment to collect information on a Xen hypervisor or dom0 crash.
+
+         If unsure, say Y.
+
 endmenu