diff options
| author | Keir Fraser <keir@xen.org> | 2013-01-30 02:51:04 -0800 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2013-01-30 02:51:04 -0800 |
| commit | 3b8e11e853bfa79e220bfcdcdea5047ad22b35e1 (patch) | |
| tree | f6ecebdf192de7fb7e5f531c48fd321d0413548c | |
| parent | 563be9eb8ea34119dbbff7221e7afd0773336761 (diff) | |
| download | xen-3b8e11e853bfa79e220bfcdcdea5047ad22b35e1.tar.gz xen-3b8e11e853bfa79e220bfcdcdea5047ad22b35e1.tar.bz2 xen-3b8e11e853bfa79e220bfcdcdea5047ad22b35e1.zip | |
xen: Define debug_build() based on NDEBUG. Use it in a few printk's.
Signed-off-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | xen/arch/arm/traps.c | 7 | ||||
| -rw-r--r-- | xen/arch/x86/x86_64/traps.c | 7 | ||||
| -rw-r--r-- | xen/drivers/char/console.c | 7 | ||||
| -rw-r--r-- | xen/include/xen/lib.h | 2 |
4 files changed, 5 insertions, 18 deletions
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index a3fd023a0c..eaf1f5234c 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -62,15 +62,10 @@ asmlinkage void __div0(void) static void print_xen_info(void) { char taint_str[TAINT_STRING_MAX_LEN]; - char debug = 'n'; - -#ifndef NDEBUG - debug = 'y'; -#endif printk("----[ Xen-%d.%d%s arm32 debug=%c %s ]----\n", xen_major_version(), xen_minor_version(), xen_extra_version(), - debug, print_tainted(taint_str)); + debug_build() ? 'y' : 'n', print_tainted(taint_str)); } uint32_t *select_user_reg(struct cpu_user_regs *regs, int reg) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 8a1d912110..2afa53ac2c 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -28,15 +28,10 @@ static void print_xen_info(void) { char taint_str[TAINT_STRING_MAX_LEN]; - char debug = 'n'; - -#ifndef NDEBUG - debug = 'y'; -#endif printk("----[ Xen-%d.%d%s x86_64 debug=%c %s ]----\n", xen_major_version(), xen_minor_version(), xen_extra_version(), - debug, print_tainted(taint_str)); + debug_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 77b9619df3..1908790df2 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -577,11 +577,6 @@ void __init console_init_preirq(void) { char *p; int sh; -#ifndef NDEBUG - char debug = 'y'; -#else - char debug = 'n'; -#endif serial_init_preirq(); @@ -616,7 +611,7 @@ void __init console_init_preirq(void) printk("Xen version %d.%d%s (%s@%s) (%s) debug=%c %s\n", xen_major_version(), xen_minor_version(), xen_extra_version(), xen_compile_by(), xen_compile_domain(), - xen_compiler(), debug, xen_compile_date()); + xen_compiler(), debug_build() ? 'y' : 'n', xen_compile_date()); printk("Latest ChangeSet: %s\n", xen_changeset()); if ( opt_sync_console ) diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index f7074cf2ff..31e1117446 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -41,8 +41,10 @@ do { \ #ifndef NDEBUG #define ASSERT(p) \ do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0) +#define debug_build() 1 #else #define ASSERT(p) do { if ( 0 && (p) ); } while (0) +#define debug_build() 0 #endif #define ABS(_x) ({ \ |