1.1 --- a/xen/arch/x86/shadow.c	Thu Apr 21 20:17:39 2005 +0000
     1.2 +++ b/xen/arch/x86/shadow.c	Thu Apr 21 20:18:32 2005 +0000
     1.3 @@ -325,7 +325,7 @@ free_shadow_hl2_table(struct domain *d, 
     1.4      l1_pgentry_t *hl2 = map_domain_mem(smfn << PAGE_SHIFT);
     1.5      int i, limit;
     1.6  
     1.7 -    SH_VVLOG("%s: smfn=%p freed\n", __func__, smfn);
     1.8 +    SH_VVLOG("%s: smfn=%p freed", __func__, smfn);
     1.9  
    1.10  #ifdef __i386__
    1.11      if ( shadow_mode_external(d) )
    1.12 @@ -2435,7 +2435,7 @@ int shadow_fault(unsigned long va, struc
    1.13  
    1.14      spte = l1e_empty();
    1.15  
    1.16 -    SH_VVLOG("shadow_fault( va=%p, code=%lu )", va, regs->error_code );
    1.17 +    SH_VVLOG("shadow_fault( va=%p, code=%lu )", va, regs->error_code);
    1.18      perfc_incrc(shadow_fault_calls);
    1.19      
    1.20      check_pagetable(ed, "pre-sf");
    1.21 @@ -2458,7 +2458,7 @@ int shadow_fault(unsigned long va, struc
    1.22      __guest_get_l2e(ed, va, &gpde);
    1.23      if ( unlikely(!(l2e_get_flags(gpde) & _PAGE_PRESENT)) )
    1.24      {
    1.25 -        SH_VVLOG("shadow_fault - EXIT: L1 not present" );
    1.26 +        SH_VVLOG("shadow_fault - EXIT: L1 not present");
    1.27          perfc_incrc(shadow_fault_bail_pde_not_present);
    1.28          goto fail;
    1.29      }
    1.30 @@ -2470,7 +2470,7 @@ int shadow_fault(unsigned long va, struc
    1.31      orig_gpte = gpte = linear_pg_table[l1_linear_offset(va)];
    1.32      if ( unlikely(!(l1e_get_flags(gpte) & _PAGE_PRESENT)) )
    1.33      {
    1.34 -        SH_VVLOG("shadow_fault - EXIT: gpte not present (%lx)",gpte );
    1.35 +        SH_VVLOG("shadow_fault - EXIT: gpte not present (%lx)", gpte);
    1.36          perfc_incrc(shadow_fault_bail_pte_not_present);
    1.37          goto fail;
    1.38      }

     2.1 --- a/xen/include/asm-x86/shadow.h	Thu Apr 21 20:17:39 2005 +0000
     2.2 +++ b/xen/include/asm-x86/shadow.h	Thu Apr 21 20:18:32 2005 +0000
     2.3 @@ -240,7 +240,7 @@ extern int shadow_status_noswap;
     2.4      printk("DOM%uP%u: SH_LOG(%d): " _f "\n",                            \
     2.5         current->domain->id , current->processor, __LINE__ , ## _a )
     2.6  #else
     2.7 -#define SH_LOG(_f, _a...) 
     2.8 +#define SH_LOG(_f, _a...) ((void)0)
     2.9  #endif
    2.10  
    2.11  #if SHADOW_VERBOSE_DEBUG
    2.12 @@ -248,7 +248,7 @@ extern int shadow_status_noswap;
    2.13      printk("DOM%uP%u: SH_VLOG(%d): " _f "\n",                           \
    2.14             current->domain->id, current->processor, __LINE__ , ## _a )
    2.15  #else
    2.16 -#define SH_VLOG(_f, _a...) 
    2.17 +#define SH_VLOG(_f, _a...) ((void)0)
    2.18  #endif
    2.19  
    2.20  #if SHADOW_VVERBOSE_DEBUG
    2.21 @@ -256,7 +256,7 @@ extern int shadow_status_noswap;
    2.22      printk("DOM%uP%u: SH_VVLOG(%d): " _f "\n",                          \
    2.23             current->domain->id, current->processor, __LINE__ , ## _a )
    2.24  #else
    2.25 -#define SH_VVLOG(_f, _a...)
    2.26 +#define SH_VVLOG(_f, _a...) ((void)0)
    2.27  #endif
    2.28  
    2.29  #if SHADOW_VVVERBOSE_DEBUG
    2.30 @@ -264,7 +264,7 @@ extern int shadow_status_noswap;
    2.31      printk("DOM%uP%u: SH_VVVLOG(%d): " _f "\n",                         \
    2.32             current->domain->id, current->processor, __LINE__ , ## _a )
    2.33  #else
    2.34 -#define SH_VVVLOG(_f, _a...)
    2.35 +#define SH_VVVLOG(_f, _a...) ((void)0)
    2.36  #endif
    2.37  
    2.38  #if FULLSHADOW_DEBUG
    2.39 @@ -272,7 +272,7 @@ extern int shadow_status_noswap;
    2.40      printk("DOM%uP%u: FSH_LOG(%d): " _f "\n",                           \
    2.41             current->domain->id, current->processor, __LINE__ , ## _a )
    2.42  #else
    2.43 -#define FSH_LOG(_f, _a...) 
    2.44 +#define FSH_LOG(_f, _a...) ((void)0)
    2.45  #endif
    2.46  
    2.47