[Xen-changelog] merge.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID c1bcea9129924dd7ddd84ed608ff73a47d8d0e93
# Parent  dfd2ded7b7127652731200e46c1e6011fb7e0f9a
# Parent  389aced92bc7ffd601a5d3a0466a31fb9704723c
merge.

diff -r dfd2ded7b712 -r c1bcea912992 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Sun Aug 14 17:32:30 2005
+++ b/xen/arch/x86/mm.c Sun Aug 14 17:33:32 2005
@@ -2771,7 +2771,7 @@
  * Writable Pagetables
  */
 
-#ifdef VERBOSE
+#ifdef VVERBOSE
 int ptwr_debug = 0x0;
 #define PTWR_PRINTK(_f, _a...) \
  do { if ( unlikely(ptwr_debug) ) printk( _f , ## _a ); } while ( 0 )
diff -r dfd2ded7b712 -r c1bcea912992 xen/arch/x86/shadow.c
--- a/xen/arch/x86/shadow.c     Sun Aug 14 17:32:30 2005
+++ b/xen/arch/x86/shadow.c     Sun Aug 14 17:33:32 2005
@@ -1578,7 +1578,7 @@
 
     if ( unlikely(!VALID_MFN(gmfn)) )
     {
-        SH_LOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
+        SH_VLOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
         *spte_p = l1e_empty();
         return 0;
     }
@@ -1612,7 +1612,7 @@
 
     if ( unlikely(!VALID_MFN(mfn)) )
     {
-        SH_LOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
+        SH_VLOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
         *spte_p = l1e_empty();
         return 0;
     }
diff -r dfd2ded7b712 -r c1bcea912992 xen/arch/x86/shadow32.c
--- a/xen/arch/x86/shadow32.c   Sun Aug 14 17:32:30 2005
+++ b/xen/arch/x86/shadow32.c   Sun Aug 14 17:33:32 2005
@@ -665,7 +665,7 @@
 
     shadow_audit(d, 0);
 
-    SH_LOG("Free shadow table.");
+    SH_VLOG("Free shadow table.");
 }
 
 void shadow_mode_init(void)
@@ -1137,7 +1137,7 @@
     d->arch.shadow_ht_free = NULL;
 
     ASSERT(d->arch.shadow_extras_count == 0);
-    SH_LOG("freed extras, now %d", d->arch.shadow_extras_count);
+    SH_VLOG("freed extras, now %d", d->arch.shadow_extras_count);
 
     if ( d->arch.shadow_dirty_bitmap != NULL )
     {
diff -r dfd2ded7b712 -r c1bcea912992 xen/include/asm-x86/shadow.h
--- a/xen/include/asm-x86/shadow.h      Sun Aug 14 17:32:30 2005
+++ b/xen/include/asm-x86/shadow.h      Sun Aug 14 17:33:32 2005
@@ -483,9 +483,9 @@
 #ifndef NDEBUG
     else if ( mfn < max_page )
     {
-        SH_LOG("mark_dirty OOR! mfn=%x pfn=%lx max=%x (dom %p)",
+        SH_VLOG("mark_dirty OOR! mfn=%x pfn=%lx max=%x (dom %p)",
                mfn, pfn, d->arch.shadow_dirty_bitmap_size, d);
-        SH_LOG("dom=%p caf=%08x taf=%" PRtype_info, 
+        SH_VLOG("dom=%p caf=%08x taf=%" PRtype_info, 
                page_get_owner(&frame_table[mfn]),
                frame_table[mfn].count_info, 
                frame_table[mfn].u.inuse.type_info );
@@ -736,7 +736,7 @@
 
     if ( unlikely(!VALID_MFN(gmfn)) )
     {
-        SH_LOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
+        SH_VLOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
         *spte_p = l1e_empty();
         return 0;
     }
@@ -770,7 +770,7 @@
 
     if ( unlikely(!VALID_MFN(mfn)) )
     {
-        SH_LOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
+        SH_VLOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
         *spte_p = l1e_empty();
         return 0;
     }
@@ -1472,7 +1472,7 @@
     /* We need to allocate a new node. Ensure the quicklist is non-empty. */
     if ( unlikely(d->arch.shadow_ht_free == NULL) )
     {
-        SH_LOG("Allocate more shadow hashtable blocks.");
+        SH_VLOG("Allocate more shadow hashtable blocks.");
 
         extra = xmalloc_bytes(
             sizeof(void *) + (shadow_ht_extra_size * sizeof(*x)));

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog