Re: [Xen-devel] [RFC PATCH 3/7] build: convert verbose to Kconfig

[Doug Goldstein]

On 5/2/16 10:18 AM, Konrad Rzeszutek Wilk wrote:
> On Sun, May 01, 2016 at 11:10:42PM -0500, Doug Goldstein wrote:
>> Convert 'verbose', which was enabled by 'debug=y' to Kconfig as
>> CONFIG_VERBOSE_DEBUG which is enabled by default when CONFIG_DEBUG is
>> enabled.
>>
>> Signed-off-by: Doug Goldstein 
>> ---
>> CC: Stefano Stabellini 
>> CC: Julien Grall 
>> CC: Jan Beulich 
>> CC: Andrew Cooper 
>> CC: Daniel De Graaf 
>> ---
>>  INSTALL | 1 -
>>  xen/Kconfig.debug   | 6 ++
>>  xen/Rules.mk| 5 -
>>  xen/arch/arm/kernel.c   | 2 +-
>>  xen/arch/x86/domain_build.c | 2 +-
>>  xen/include/xsm/dummy.h | 2 +-
>>  6 files changed, 9 insertions(+), 9 deletions(-)
>>
>> diff --git a/INSTALL b/INSTALL
>> index 2974b9b..35668bd 100644
>> --- a/INSTALL
>> +++ b/INSTALL
>> @@ -227,7 +227,6 @@ VGABIOS_REL_DATE="dd Mon "
>>  
>>  The following variables can be used to tweak some aspects of the
>>  hypervisor build.
>> -verbose=y
>>  perfc=y
>>  perfc_arrays=y
>>  lock_profile=y
>> diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug
>> index ee68f0d..94a6381 100644
>> --- a/xen/Kconfig.debug
>> +++ b/xen/Kconfig.debug
>> @@ -15,4 +15,10 @@ config CRASH_DEBUG
>>If you want to be able to attach gdb to Xen to be able to debug
>>Xen if it crashes then say Y.
>>  
>> +config VERBOSE_DEBUG
>> +bool "Verbose debug messages"
>> +default y
>> +---help---
>> +  Enables the verbose flag when loading ELF images.
> 
> ..and when guests use HYPERVISOR_console_io
> 
> Perhaps:
> 
> Guest output from HYPERVISOR_console_io and hypervisor parsing ELF images
> (dom0) is logged in the Xen ring buffer?

Much better. Thanks!

-- 
Doug Goldstein



signature.asc
Description: OpenPGP digital signature
___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [Xen-devel] [RFC PATCH 3/7] build: convert verbose to Kconfig

[Konrad Rzeszutek Wilk]

On Sun, May 01, 2016 at 11:10:42PM -0500, Doug Goldstein wrote:
> Convert 'verbose', which was enabled by 'debug=y' to Kconfig as
> CONFIG_VERBOSE_DEBUG which is enabled by default when CONFIG_DEBUG is
> enabled.
> 
> Signed-off-by: Doug Goldstein 
> ---
> CC: Stefano Stabellini 
> CC: Julien Grall 
> CC: Jan Beulich 
> CC: Andrew Cooper 
> CC: Daniel De Graaf 
> ---
>  INSTALL | 1 -
>  xen/Kconfig.debug   | 6 ++
>  xen/Rules.mk| 5 -
>  xen/arch/arm/kernel.c   | 2 +-
>  xen/arch/x86/domain_build.c | 2 +-
>  xen/include/xsm/dummy.h | 2 +-
>  6 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/INSTALL b/INSTALL
> index 2974b9b..35668bd 100644
> --- a/INSTALL
> +++ b/INSTALL
> @@ -227,7 +227,6 @@ VGABIOS_REL_DATE="dd Mon "
>  
>  The following variables can be used to tweak some aspects of the
>  hypervisor build.
> -verbose=y
>  perfc=y
>  perfc_arrays=y
>  lock_profile=y
> diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug
> index ee68f0d..94a6381 100644
> --- a/xen/Kconfig.debug
> +++ b/xen/Kconfig.debug
> @@ -15,4 +15,10 @@ config CRASH_DEBUG
> If you want to be able to attach gdb to Xen to be able to debug
> Xen if it crashes then say Y.
>  
> +config VERBOSE_DEBUG
> + bool "Verbose debug messages"
> + default y
> + ---help---
> +   Enables the verbose flag when loading ELF images.

..and when guests use HYPERVISOR_console_io

Perhaps:

Guest output from HYPERVISOR_console_io and hypervisor parsing ELF images
(dom0) is logged in the Xen ring buffer?

> +
>  endif # DEBUG
> diff --git a/xen/Rules.mk b/xen/Rules.mk
> index c044fd1..b159451 100644
> --- a/xen/Rules.mk
> +++ b/xen/Rules.mk
> @@ -3,7 +3,6 @@
>  # If you change any of these configuration options then you must
>  # 'make clean' before rebuilding.
>  #
> -verbose   ?= n
>  perfc ?= n
>  perfc_arrays  ?= n
>  lock_profile  ?= n
> @@ -17,10 +16,7 @@ include $(XEN_ROOT)/Config.mk
>  # Hardcoded configuration implications and dependencies.
>  # Do this is a neater way if it becomes unwieldy.
>  ifeq ($(debug),y)
> -verbose   := y
>  frame_pointer := y
> -else
> -CFLAGS += -DNDEBUG
>  endif
>  ifeq ($(perfc_arrays),y)
>  perfc := y
> @@ -59,7 +55,6 @@ ifneq ($(clang),y)
>  CFLAGS += -Wa,--strip-local-absolute
>  endif
>  
> -CFLAGS-$(verbose)   += -DVERBOSE
>  CFLAGS-$(perfc) += -DPERF_COUNTERS
>  CFLAGS-$(perfc_arrays)  += -DPERF_ARRAYS
>  CFLAGS-$(lock_profile)  += -DLOCK_PROFILE
> diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c
> index 9871bd9..3f6cce3 100644
> --- a/xen/arch/arm/kernel.c
> +++ b/xen/arch/arm/kernel.c
> @@ -472,7 +472,7 @@ static int kernel_elf_probe(struct kernel_info *info,
>  
>  if ( (rc = elf_init(>elf.elf, info->elf.kernel_img, size )) != 0 )
>  goto err;
> -#ifdef VERBOSE
> +#ifdef CONFIG_VERBOSE_DEBUG
>  elf_set_verbose(>elf.elf);
>  #endif
>  elf_parse_binary(>elf.elf);
> diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
> index f9a3eca..b29c377 100644
> --- a/xen/arch/x86/domain_build.c
> +++ b/xen/arch/x86/domain_build.c
> @@ -942,7 +942,7 @@ int __init construct_dom0(
>  
>  if ( (rc = elf_init(, image_start, image_len)) != 0 )
>  return rc;
> -#ifdef VERBOSE
> +#ifdef CONFIG_VERBOSE_DEBUG
>  elf_set_verbose();
>  #endif
>  elf_parse_binary();
> diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h
> index abbe282..406cd18 100644
> --- a/xen/include/xsm/dummy.h
> +++ b/xen/include/xsm/dummy.h
> @@ -215,7 +215,7 @@ static XSM_INLINE int 
> xsm_memory_stat_reservation(XSM_DEFAULT_ARG struct domain
>  static XSM_INLINE int xsm_console_io(XSM_DEFAULT_ARG struct domain *d, int 
> cmd)
>  {
>  XSM_ASSERT_ACTION(XSM_OTHER);
> -#ifdef VERBOSE
> +#ifdef CONFIG_VERBOSE_DEBUG
>  if ( cmd == CONSOLEIO_write )
>  return xsm_default_action(XSM_HOOK, d, NULL);
>  #endif
> -- 
> 2.7.3
> 
> 
> ___
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

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

[Xen-devel] [RFC PATCH 3/7] build: convert verbose to Kconfig

[Doug Goldstein]

Convert 'verbose', which was enabled by 'debug=y' to Kconfig as
CONFIG_VERBOSE_DEBUG which is enabled by default when CONFIG_DEBUG is
enabled.

Signed-off-by: Doug Goldstein 
---
CC: Stefano Stabellini 
CC: Julien Grall 
CC: Jan Beulich 
CC: Andrew Cooper 
CC: Daniel De Graaf 
---
 INSTALL | 1 -
 xen/Kconfig.debug   | 6 ++
 xen/Rules.mk| 5 -
 xen/arch/arm/kernel.c   | 2 +-
 xen/arch/x86/domain_build.c | 2 +-
 xen/include/xsm/dummy.h | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/INSTALL b/INSTALL
index 2974b9b..35668bd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -227,7 +227,6 @@ VGABIOS_REL_DATE="dd Mon "
 
 The following variables can be used to tweak some aspects of the
 hypervisor build.
-verbose=y
 perfc=y
 perfc_arrays=y
 lock_profile=y
diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug
index ee68f0d..94a6381 100644
--- a/xen/Kconfig.debug
+++ b/xen/Kconfig.debug
@@ -15,4 +15,10 @@ config CRASH_DEBUG
  If you want to be able to attach gdb to Xen to be able to debug
  Xen if it crashes then say Y.
 
+config VERBOSE_DEBUG
+   bool "Verbose debug messages"
+   default y
+   ---help---
+ Enables the verbose flag when loading ELF images.
+
 endif # DEBUG
diff --git a/xen/Rules.mk b/xen/Rules.mk
index c044fd1..b159451 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -3,7 +3,6 @@
 # If you change any of these configuration options then you must
 # 'make clean' before rebuilding.
 #
-verbose   ?= n
 perfc ?= n
 perfc_arrays  ?= n
 lock_profile  ?= n
@@ -17,10 +16,7 @@ include $(XEN_ROOT)/Config.mk
 # Hardcoded configuration implications and dependencies.
 # Do this is a neater way if it becomes unwieldy.
 ifeq ($(debug),y)
-verbose   := y
 frame_pointer := y
-else
-CFLAGS += -DNDEBUG
 endif
 ifeq ($(perfc_arrays),y)
 perfc := y
@@ -59,7 +55,6 @@ ifneq ($(clang),y)
 CFLAGS += -Wa,--strip-local-absolute
 endif
 
-CFLAGS-$(verbose)   += -DVERBOSE
 CFLAGS-$(perfc) += -DPERF_COUNTERS
 CFLAGS-$(perfc_arrays)  += -DPERF_ARRAYS
 CFLAGS-$(lock_profile)  += -DLOCK_PROFILE
diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c
index 9871bd9..3f6cce3 100644
--- a/xen/arch/arm/kernel.c
+++ b/xen/arch/arm/kernel.c
@@ -472,7 +472,7 @@ static int kernel_elf_probe(struct kernel_info *info,
 
 if ( (rc = elf_init(>elf.elf, info->elf.kernel_img, size )) != 0 )
 goto err;
-#ifdef VERBOSE
+#ifdef CONFIG_VERBOSE_DEBUG
 elf_set_verbose(>elf.elf);
 #endif
 elf_parse_binary(>elf.elf);
diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index f9a3eca..b29c377 100644
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -942,7 +942,7 @@ int __init construct_dom0(
 
 if ( (rc = elf_init(, image_start, image_len)) != 0 )
 return rc;
-#ifdef VERBOSE
+#ifdef CONFIG_VERBOSE_DEBUG
 elf_set_verbose();
 #endif
 elf_parse_binary();
diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h
index abbe282..406cd18 100644
--- a/xen/include/xsm/dummy.h
+++ b/xen/include/xsm/dummy.h
@@ -215,7 +215,7 @@ static XSM_INLINE int 
xsm_memory_stat_reservation(XSM_DEFAULT_ARG struct domain
 static XSM_INLINE int xsm_console_io(XSM_DEFAULT_ARG struct domain *d, int cmd)
 {
 XSM_ASSERT_ACTION(XSM_OTHER);
-#ifdef VERBOSE
+#ifdef CONFIG_VERBOSE_DEBUG
 if ( cmd == CONSOLEIO_write )
 return xsm_default_action(XSM_HOOK, d, NULL);
 #endif
-- 
2.7.3


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