Re: [Xen-devel] [PATCHv6] 15/28] build: convert HAS_KEXEC use to Kconfig

[Jan Beulich]

>>> On 24.11.15 at 18:52,  wrote:
> --- a/xen/Rules.mk
> +++ b/xen/Rules.mk
> @@ -68,7 +68,7 @@ ifneq ($(max_phys_irqs),)
>  CFLAGS-y+= -DMAX_PHYS_IRQS=$(max_phys_irqs)
>  endif
>  
> -CONFIG_KEXEC-$(HAS_KEXEC) := $(kexec)
> +CONFIG_KEXEC-$(CONFIG_HAS_KEXEC) := $(kexec)
>  CONFIG_KEXEC  := $(CONFIG_KEXEC-y)

This may be another exception to the "no prompts" rule, since we
already allow the feature to be turned of from the make command
line. However, you should do away with the old method then (and
the option then likely should be KEXEC, not HAS_KEXEC, since I
don't think HAS_KEXEC but !KEXEC would produce anything useful).

Jan


___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

[Xen-devel] [PATCHv6] 15/28] build: convert HAS_KEXEC use to Kconfig

[Doug Goldstein]

Use the Kconfig generated CONFIG_HAS_KEXEC defines in the code base.

CC: Keir Fraser 
CC: Jan Beulich 
CC: Andrew Cooper 
Signed-off-by: Doug Goldstein 
Acked-by: Andrew Cooper 
Tested-by: Andrew Cooper 
---
 xen/Rules.mk  | 2 +-
 xen/arch/x86/Kconfig  | 1 +
 xen/arch/x86/Rules.mk | 1 -
 xen/common/Kconfig| 4 
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/xen/Rules.mk b/xen/Rules.mk
index c2a3e15..4d90aca 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -68,7 +68,7 @@ ifneq ($(max_phys_irqs),)
 CFLAGS-y+= -DMAX_PHYS_IRQS=$(max_phys_irqs)
 endif
 
-CONFIG_KEXEC-$(HAS_KEXEC) := $(kexec)
+CONFIG_KEXEC-$(CONFIG_HAS_KEXEC) := $(kexec)
 CONFIG_KEXEC  := $(CONFIG_KEXEC-y)
 
 CFLAGS-$(CONFIG_KEXEC)  += -DCONFIG_KEXEC
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index a285a1c..01cfe69 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -13,6 +13,7 @@ config X86
select UART_NS16550
select HAS_GDBSX
select HAS_PDX
+   select HAS_KEXEC
 
 config ARCH_DEFCONFIG
string
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 193e7ea..793e1f7 100644
--- 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 b429a64..6987e84 100644
--- 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
-- 
2.4.10


___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel