Re: [PATCH] The BUG() macro should print the correct architecture, not a hardcoded value.

[Andrew Cooper <andrew.cooper3@citrix.com>]

On 11/01/13 13:15, lra@sics.se wrote:
> From: Lars Rasmusson <Lars.Rasmusson@sics.se>
>
> Signed-off-by: Lars Rasmusson <Lars.Rasmusson@sics.se>
> ---
>  xen/arch/arm/traps.c |   18 +++++++++++++++++-
>  1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> index f42e4e9..1909abf 100644
> --- a/xen/arch/arm/traps.c
> +++ b/xen/arch/arm/traps.c
> @@ -68,7 +68,23 @@ static void print_xen_info(void)
>      debug = 'y';
>  #endif
>  
> -    printk("----[ Xen-%d.%d%s  x86_64  debug=%c  %s ]----\n",
> +#ifdef CONFIG_ARM_32
> +#define THE_ARCH "arm_32"
> +#elif CONFIG_ARM_64
> +#define THE_ARCH "arm_64"
> +#elif CONFIG_ARM
> +#define THE_ARCH "arm"
> +#elif CONFIG_X86_32
> +#define THE_ARCH "x86_32"
> +#elif CONFIG_X86_64
> +#define THE_ARCH "x86_64"
> +#elif CONFIG_X86
> +#define THE_ARCH "x86"
> +#else      
> +#define THE_ARCH "unknown_arch"
> +#endif

The value should not be x86_64, but this is not the correct way to get
the architecture.  In xen/arch/arm, you can be certain that the arch is
not unknown, nor is it any x86.

~Andrew

> +
> +    printk("----[ Xen-%d.%d%s  " THE_ARCH "  debug=%c  %s ]----\n",
>             xen_major_version(), xen_minor_version(), xen_extra_version(),
>             debug, print_tainted(taint_str));
>  }