ia64/xen-unstable

changeset 6164:389aced92bc7

Now we have verbose=y in Xen by default, tidy up a few unhelpful printk's.
Signed-off-by: ian@xensource.com
author iap10@freefall.cl.cam.ac.uk
date Sun Aug 14 16:55:34 2005 +0000 (2005-08-14)
parents 3fe7b0b7f6c5
children c1bcea912992
files xen/arch/x86/mm.c xen/arch/x86/shadow.c xen/arch/x86/shadow32.c xen/include/asm-x86/shadow.h
line diff
     1.1 --- a/xen/arch/x86/mm.c	Sun Aug 14 09:17:54 2005 +0000
     1.2 +++ b/xen/arch/x86/mm.c	Sun Aug 14 16:55:34 2005 +0000
     1.3 @@ -2841,7 +2841,7 @@ long do_update_descriptor(unsigned long 
     1.4   * Writable Pagetables
     1.5   */
     1.6  
     1.7 -#ifdef VERBOSE
     1.8 +#ifdef VVERBOSE
     1.9  int ptwr_debug = 0x0;
    1.10  #define PTWR_PRINTK(_f, _a...) \
    1.11   do { if ( unlikely(ptwr_debug) ) printk( _f , ## _a ); } while ( 0 )
    1.12 @@ -3054,7 +3054,7 @@ void ptwr_flush(struct domain *d, const 
    1.13           */
    1.14          BUG();
    1.15      }
    1.16 -    PTWR_PRINTK("[%c] disconnected_l1va at %p is %lx\n",
    1.17 +    PTWR_PRINTK("[%c] disconnected_l1va at %p is %" PRIpte "\n",
    1.18                  PTWR_PRINT_WHICH, ptep, pte.l1);
    1.19      l1e_remove_flags(pte, _PAGE_RW);
    1.20  
    1.21 @@ -3072,7 +3072,7 @@ void ptwr_flush(struct domain *d, const 
    1.22      /* Ensure that there are no stale writable mappings in any TLB. */
    1.23      /* NB. INVLPG is a serialising instruction: flushes pending updates. */
    1.24      flush_tlb_one_mask(d->cpumask, l1va);
    1.25 -    PTWR_PRINTK("[%c] disconnected_l1va at %p now %lx\n",
    1.26 +    PTWR_PRINTK("[%c] disconnected_l1va at %p now %" PRIpte "\n",
    1.27                  PTWR_PRINT_WHICH, ptep, pte.l1);
    1.28  
    1.29      /*
     2.1 --- a/xen/arch/x86/shadow.c	Sun Aug 14 09:17:54 2005 +0000
     2.2 +++ b/xen/arch/x86/shadow.c	Sun Aug 14 16:55:34 2005 +0000
     2.3 @@ -1578,7 +1578,7 @@ static inline int l1pte_write_fault(
     2.4  
     2.5      if ( unlikely(!VALID_MFN(gmfn)) )
     2.6      {
     2.7 -        SH_LOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
     2.8 +        SH_VLOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
     2.9          *spte_p = l1e_empty();
    2.10          return 0;
    2.11      }
    2.12 @@ -1612,7 +1612,7 @@ static inline int l1pte_read_fault(
    2.13  
    2.14      if ( unlikely(!VALID_MFN(mfn)) )
    2.15      {
    2.16 -        SH_LOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
    2.17 +        SH_VLOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
    2.18          *spte_p = l1e_empty();
    2.19          return 0;
    2.20      }
     3.1 --- a/xen/arch/x86/shadow32.c	Sun Aug 14 09:17:54 2005 +0000
     3.2 +++ b/xen/arch/x86/shadow32.c	Sun Aug 14 16:55:34 2005 +0000
     3.3 @@ -665,7 +665,7 @@ static void free_shadow_pages(struct dom
     3.4  
     3.5      shadow_audit(d, 0);
     3.6  
     3.7 -    SH_LOG("Free shadow table.");
     3.8 +    SH_VLOG("Free shadow table.");
     3.9  }
    3.10  
    3.11  void shadow_mode_init(void)
    3.12 @@ -1137,7 +1137,7 @@ static void free_shadow_ht_entries(struc
    3.13      d->arch.shadow_ht_free = NULL;
    3.14  
    3.15      ASSERT(d->arch.shadow_extras_count == 0);
    3.16 -    SH_LOG("freed extras, now %d", d->arch.shadow_extras_count);
    3.17 +    SH_VLOG("freed extras, now %d", d->arch.shadow_extras_count);
    3.18  
    3.19      if ( d->arch.shadow_dirty_bitmap != NULL )
    3.20      {
     4.1 --- a/xen/include/asm-x86/shadow.h	Sun Aug 14 09:17:54 2005 +0000
     4.2 +++ b/xen/include/asm-x86/shadow.h	Sun Aug 14 16:55:34 2005 +0000
     4.3 @@ -483,9 +483,9 @@ static inline int __mark_dirty(struct do
     4.4  #ifndef NDEBUG
     4.5      else if ( mfn < max_page )
     4.6      {
     4.7 -        SH_LOG("mark_dirty OOR! mfn=%x pfn=%lx max=%x (dom %p)",
     4.8 +        SH_VLOG("mark_dirty OOR! mfn=%x pfn=%lx max=%x (dom %p)",
     4.9                 mfn, pfn, d->arch.shadow_dirty_bitmap_size, d);
    4.10 -        SH_LOG("dom=%p caf=%08x taf=%" PRtype_info, 
    4.11 +        SH_VLOG("dom=%p caf=%08x taf=%" PRtype_info, 
    4.12                 page_get_owner(&frame_table[mfn]),
    4.13                 frame_table[mfn].count_info, 
    4.14                 frame_table[mfn].u.inuse.type_info );
    4.15 @@ -736,7 +736,7 @@ static inline int l1pte_write_fault(
    4.16  
    4.17      if ( unlikely(!VALID_MFN(gmfn)) )
    4.18      {
    4.19 -        SH_LOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
    4.20 +        SH_VLOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
    4.21          *spte_p = l1e_empty();
    4.22          return 0;
    4.23      }
    4.24 @@ -770,7 +770,7 @@ static inline int l1pte_read_fault(
    4.25  
    4.26      if ( unlikely(!VALID_MFN(mfn)) )
    4.27      {
    4.28 -        SH_LOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
    4.29 +        SH_VLOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
    4.30          *spte_p = l1e_empty();
    4.31          return 0;
    4.32      }
    4.33 @@ -1472,7 +1472,7 @@ static inline void set_shadow_status(
    4.34      /* We need to allocate a new node. Ensure the quicklist is non-empty. */
    4.35      if ( unlikely(d->arch.shadow_ht_free == NULL) )
    4.36      {
    4.37 -        SH_LOG("Allocate more shadow hashtable blocks.");
    4.38 +        SH_VLOG("Allocate more shadow hashtable blocks.");
    4.39  
    4.40          extra = xmalloc_bytes(
    4.41              sizeof(void *) + (shadow_ht_extra_size * sizeof(*x)));