Re: [Xen-devel] [PATCH v2 1/4] xen: indicate gcov in log messages

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

On 06/09/16 13:41, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> ---
> Cc: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> Cc: Julien Grall <julien.grall@xxxxxxx>
> Cc: Jan Beulich <jbeulich@xxxxxxxx>
> Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> ---
>  xen/arch/arm/traps.c        | 5 +++--
>  xen/arch/x86/x86_64/traps.c | 5 +++--
>  xen/drivers/char/console.c  | 5 +++--
>  xen/include/xen/lib.h       | 6 ++++++
>  4 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> index 683bcb2..3bac8e8 100644
> --- a/xen/arch/arm/traps.c
> +++ b/xen/arch/arm/traps.c
> @@ -141,14 +141,15 @@ static void print_xen_info(void)
>  {
>      char taint_str[TAINT_STRING_MAX_LEN];
>  
> -    printk("----[ Xen-%d.%d%s  %s  debug=%c  %s ]----\n",
> +    printk("----[ Xen-%d.%d%s  %s  debug=%c gcov=%c  %s ]----\n",
>             xen_major_version(), xen_minor_version(), xen_extra_version(),
>  #ifdef CONFIG_ARM_32
>             "arm32",
>  #else
>             "arm64",
>  #endif
> -           debug_build() ? 'y' : 'n', print_tainted(taint_str));
> +           debug_build() ? 'y' : 'n', gcov_build() ? 'y' : 'n',
> +           print_tainted(taint_str));
>  }
>  
>  #ifdef CONFIG_ARM_32
> diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
> index 2d8ecf5..0708cc7 100644
> --- a/xen/arch/x86/x86_64/traps.c
> +++ b/xen/arch/x86/x86_64/traps.c
> @@ -30,9 +30,10 @@ static void print_xen_info(void)
>  {
>      char taint_str[TAINT_STRING_MAX_LEN];
>  
> -    printk("----[ Xen-%d.%d%s  x86_64  debug=%c  %s ]----\n",
> +    printk("----[ Xen-%d.%d%s  x86_64  debug=%c gcov=%c %s ]----\n",
>             xen_major_version(), xen_minor_version(), xen_extra_version(),
> -           debug_build() ? 'y' : 'n', print_tainted(taint_str));
> +           debug_build() ? 'y' : 'n', gcov_build() ? 'y' : 'n',
> +           print_tainted(taint_str));
>  }
>  
>  enum context { CTXT_hypervisor, CTXT_pv_guest, CTXT_hvm_guest };
> diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
> index 650035d..e773076 100644
> --- a/xen/drivers/char/console.c
> +++ b/xen/drivers/char/console.c
> @@ -735,10 +735,11 @@ void __init console_init_preirq(void)
>      spin_lock(&console_lock);
>      __putstr(xen_banner());
>      spin_unlock(&console_lock);
> -    printk("Xen version %d.%d%s (%s@%s) (%s) debug=%c %s\n",
> +    printk("Xen version %d.%d%s (%s@%s) (%s) debug=%c gcov=%c %s\n",

Please instead use

printk("Xen version %d.%d%s (%s@%s) (%s) debug=%c"
#ifdef CONFIG_GCOV
" gcov=y"
#endif
" %s\n",

Enabling gcov will be extremely rare in the grand scheme of things, and
this method causes zero overhead for the case where gcov is compiled
out.  (Similarly elsewhere.)

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel