From bacbf0cb73490ff12dba9436e4a038a4774a0037 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Wed, 8 Jun 2016 14:04:30 +0200 Subject: [PATCH] build: convert debug to Kconfig Enabling debug will disable NDEBUG which will result in more debug prints. There are a number of debugging options for Xen so place the debug option under a menu for different debugging options to have a way to group them all together. Signed-off-by: Doug Goldstein Reviewed-by: Andrew Cooper Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Wei Liu Acked-by: Jan Beulich --- xen/Kconfig | 2 ++ xen/Kconfig.debug | 14 ++++++++++++++ xen/Rules.mk | 5 +++-- xen/include/xen/config.h | 4 ++++ 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 xen/Kconfig.debug diff --git a/xen/Kconfig b/xen/Kconfig index fa8b27c853..0fe7a1a251 100644 --- a/xen/Kconfig +++ b/xen/Kconfig @@ -26,3 +26,5 @@ config DEFCONFIG_LIST config EXPERT string option env="XEN_CONFIG_EXPERT" + +source "Kconfig.debug" diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug new file mode 100644 index 0000000000..796af0c98b --- /dev/null +++ b/xen/Kconfig.debug @@ -0,0 +1,14 @@ + +menu "Debugging Options" + +config DEBUG + bool "Developer Checks" + default y + ---help--- + If you say Y here this will enable developer checks such as asserts + and extra printks. This option is intended for development purposes + only, and not for production use. + + You probably want to say 'N' here. + +endmenu diff --git a/xen/Rules.mk b/xen/Rules.mk index 961d533da2..da2f490f4e 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -20,13 +20,14 @@ include $(XEN_ROOT)/Config.mk ifeq ($(debug),y) verbose := y frame_pointer := y -else -CFLAGS += -DNDEBUG endif ifeq ($(perfc_arrays),y) perfc := y endif +ifeq ($(origin debug),command line) +$(warning "You must use 'make menuconfig' to enable/disable debug now.") +endif ifneq ($(origin kexec),undefined) $(error "You must use 'make menuconfig' to enable/disable kexec now.") endif diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index ef6e5ee22b..473c5e8c3e 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -81,4 +81,8 @@ /* allow existing code to work with Kconfig variable */ #define NR_CPUS CONFIG_NR_CPUS +#ifndef CONFIG_DEBUG +#define NDEBUG +#endif + #endif /* __XEN_CONFIG_H__ */ -- 2.39.5