ia64/xen-unstable

changeset 2060:539c0e6f0384

bitkeeper revision 1.1134 (410fc14f4HAr8IlztN3Sv7_-cHFa-w)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno
author kaf24@scramble.cl.cam.ac.uk
date Tue Aug 03 16:46:07 2004 +0000 (2004-08-03)
parents 1ac7603a60bd 6c97e3c04673
children 20a45872cb42
files xen/Rules.mk xen/arch/x86/io_apic.c xen/arch/x86/memory.c xen/common/physdev.c xen/include/asm-x86/shadow.h xen/include/xen/config.h
line diff
     1.1 --- a/xen/Rules.mk	Tue Aug 03 16:01:12 2004 +0000
     1.2 +++ b/xen/Rules.mk	Tue Aug 03 16:46:07 2004 +0000
     1.3 @@ -40,6 +40,11 @@ include $(BASEDIR)/arch/$(TARGET_ARCH)/R
     1.4  
     1.5  ifneq ($(debug),y)
     1.6  CFLAGS += -DNDEBUG
     1.7 +ifeq ($(verbose),y)
     1.8 +CFLAGS += -DVERBOSE
     1.9 +endif
    1.10 +else
    1.11 +CFLAGS += -DVERBOSE
    1.12  endif
    1.13  
    1.14  ifeq ($(debugger),y)
     2.1 --- a/xen/arch/x86/io_apic.c	Tue Aug 03 16:01:12 2004 +0000
     2.2 +++ b/xen/arch/x86/io_apic.c	Tue Aug 03 16:46:07 2004 +0000
     2.3 @@ -808,7 +808,7 @@ void __init UNEXPECTED_IO_APIC(void)
     2.4  
     2.5  void __init print_IO_APIC(void)
     2.6  {
     2.7 -#ifndef NDEBUG
     2.8 +#ifdef VERBOSE
     2.9  	int apic, i;
    2.10  	struct IO_APIC_reg_00 reg_00;
    2.11  	struct IO_APIC_reg_01 reg_01;
     3.1 --- a/xen/arch/x86/memory.c	Tue Aug 03 16:01:12 2004 +0000
     3.2 +++ b/xen/arch/x86/memory.c	Tue Aug 03 16:46:07 2004 +0000
     3.3 @@ -100,7 +100,7 @@
     3.4  #include <asm/domain_page.h>
     3.5  #include <asm/ldt.h>
     3.6  
     3.7 -#ifndef NDEBUG
     3.8 +#ifdef VERBOSE
     3.9  #define MEM_LOG(_f, _a...)                           \
    3.10    printk("DOM%u: (file=memory.c, line=%d) " _f "\n", \
    3.11           current->domain , __LINE__ , ## _a )
    3.12 @@ -1250,7 +1250,7 @@ ptwr_info_t ptwr_info[NR_CPUS] =
    3.13        }
    3.14      };
    3.15  
    3.16 -#ifndef NDEBUG
    3.17 +#ifdef VERBOSE
    3.18  int ptwr_debug = 0;
    3.19  #define PTWR_PRINTK(x) if (ptwr_debug) printk x
    3.20  #else
     4.1 --- a/xen/common/physdev.c	Tue Aug 03 16:01:12 2004 +0000
     4.2 +++ b/xen/common/physdev.c	Tue Aug 03 16:46:07 2004 +0000
     4.3 @@ -38,7 +38,7 @@ extern void pcibios_enable_irq(struct pc
     4.4  #define VERBOSE_INFO(_f, _a...) ((void)0)
     4.5  #endif
     4.6  
     4.7 -#ifndef NDEBUG
     4.8 +#ifdef VERBOSE
     4.9  #define INFO(_f, _a...) printk( _f, ## _a )
    4.10  #else
    4.11  #define INFO(_f, _a...) ((void)0)
     5.1 --- a/xen/include/asm-x86/shadow.h	Tue Aug 03 16:01:12 2004 +0000
     5.2 +++ b/xen/include/asm-x86/shadow.h	Tue Aug 03 16:46:07 2004 +0000
     5.3 @@ -60,7 +60,7 @@ struct shadow_status {
     5.4  #define shadow_ht_extra_size         128 /*128*/
     5.5  #define shadow_ht_buckets            256 /*256*/
     5.6  
     5.7 -#ifndef NDEBUG
     5.8 +#ifdef VERBOSE
     5.9  #define SH_LOG(_f, _a...)                             \
    5.10  printk("DOM%u: (file=shadow.c, line=%d) " _f "\n",    \
    5.11         current->domain , __LINE__ , ## _a )
     6.1 --- a/xen/include/xen/config.h	Tue Aug 03 16:01:12 2004 +0000
     6.2 +++ b/xen/include/xen/config.h	Tue Aug 03 16:46:07 2004 +0000
     6.3 @@ -31,7 +31,7 @@
     6.4  
     6.5  #define capable(_c) 0
     6.6  
     6.7 -#ifndef NDEBUG
     6.8 +#ifdef VERBOSE
     6.9  #define DPRINTK(_f, _a...) printk("(file=%s, line=%d) " _f, \
    6.10                             __FILE__ , __LINE__ , ## _a )
    6.11  #else