[Xen-changelog] Cleanup after merge

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1270, 2005/04/05 09:49:46+01:00, mafetter@xxxxxxxxxxxxxxxx

        Cleanup after merge
        
        Signed-off-by: michael.fetterman@xxxxxxxxxxxx



 arch/x86/mm.c        |    2 +-
 arch/x86/shadow.c    |   21 ++++++---------------
 include/asm-x86/mm.h |   12 +++++-------
 3 files changed, 12 insertions(+), 23 deletions(-)


diff -Nru a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c 2005-04-05 12:22:13 -04:00
+++ b/xen/arch/x86/mm.c 2005-04-05 12:22:13 -04:00
@@ -2683,7 +2683,7 @@
     int              which;
     u32              l2_idx;
 
-    if ( unlikely(shadow_mode_enabled(ed->domain)) )
+    if ( unlikely(shadow_mode_enabled(d)) )
         return 0;
 
     /*
diff -Nru a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c
--- a/xen/arch/x86/shadow.c     2005-04-05 12:22:13 -04:00
+++ b/xen/arch/x86/shadow.c     2005-04-05 12:22:13 -04:00
@@ -583,6 +583,11 @@
 {
 }
 
+int _shadow_mode_enabled(struct domain *d)
+{
+    return shadow_mode_enabled(d);
+}
+
 static void alloc_monitor_pagetable(struct exec_domain *ed)
 {
     unsigned long mmfn;
@@ -2623,21 +2628,7 @@
     // thus potentially out-of-sync) guest page.
     //
     if ( VM_ASSIST(d, VMASST_TYPE_writable_pagetables) )
-    {
-        int cpu = current->processor;
-
-        for ( i = 0; i < ARRAY_SIZE(ptwr_info->ptinfo); i++)
-        {
-            if ( ptwr_info[cpu].ptinfo[i].l1va &&
-                 ((v2m(ptwr_info[cpu].ptinfo[i].pl1e) >> PAGE_SHIFT) == gmfn) )
-            {
-                unsigned long old = gmfn;
-                gmfn = (v2m(ptwr_info[cpu].ptinfo[i].page) >> PAGE_SHIFT);
-                printk("hit1 ptwr_info[%d].ptinfo[%d].l1va, mfn=0x%08x, 
snapshot=0x%08x\n",
-                       cpu, i, old, gmfn);
-            }
-        }
-    }
+        BUG();
 
     if ( page_out_of_sync(pfn_to_page(gmfn)) )
     {
diff -Nru a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
--- a/xen/include/asm-x86/mm.h  2005-04-05 12:22:13 -04:00
+++ b/xen/include/asm-x86/mm.h  2005-04-05 12:22:13 -04:00
@@ -4,8 +4,8 @@
 
 #include <xen/config.h>
 #include <xen/list.h>
-#include <xen/sched.h>
 #include <asm/io.h>
+#include <asm/uaccess.h>
 
 /*
  * Per-page-frame information.
@@ -150,6 +150,7 @@
 extern int shadow_remove_all_write_access(
     struct domain *d, unsigned long gpfn, unsigned long gmfn);
 extern u32 shadow_remove_all_access( struct domain *d, unsigned long gmfn);
+extern int _shadow_mode_enabled(struct domain *d);
 
 static inline void put_page(struct pfn_info *page)
 {
@@ -181,12 +182,9 @@
              unlikely((nx & PGC_count_mask) == 0) || /* Count overflow? */
              unlikely(d != _domain) )                /* Wrong owner? */
         {
-            if ( !domain->arch.shadow_mode )
-                DPRINTK("Error pfn %p: rd=%p(%d), od=%p(%d), caf=%08x, "
-                        "taf=%08x\n",
-                        page_to_pfn(page), domain, (domain ? domain->id : -1),
-                        page_get_owner(page),
-                        (page_get_owner(page) ? page_get_owner(page)->id : -1),
+            if ( !_shadow_mode_enabled(domain) )
+                DPRINTK("Error pfn %p: rd=%p, od=%p, caf=%08x, taf=%08x\n",
+                        page_to_pfn(page), domain, unpickle_domptr(d),
                         x, page->u.inuse.type_info);
             return 0;
         }

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