[Xen-changelog] misc debug audit cleanups

[BitKeeper B. <ri...@su...>]

ChangeSet 1.1684.35.1, 2005/02/08 19:23:44+00:00, ia...@fr...

	misc debug audit cleanups
	Signed-off-by: ian...@cl...



 domain.c |    1 +
 mm.c     |   12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)


diff -Nru a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c	2005-02-08 15:03:13 -05:00
+++ b/xen/arch/x86/domain.c	2005-02-08 15:03:13 -05:00
@@ -783,6 +783,7 @@
         if ( pagetable_val(ed->arch.pagetable) != 0 )
             put_page_and_type(&frame_table[pagetable_val(ed->arch.pagetable) >>
                                            PAGE_SHIFT]);
+        ed->arch.pagetable = mk_pagetable(0);
     }
 
 #ifdef CONFIG_VMX
diff -Nru a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c	2005-02-08 15:03:13 -05:00
+++ b/xen/arch/x86/mm.c	2005-02-08 15:03:13 -05:00
@@ -2320,8 +2320,9 @@
 
 
     /* PHASE 1 */
-
-    adjust(&frame_table[pagetable_val(d->exec_domain[0]->arch.pagetable)>>PAGE_SHIFT], -1, 1);
+    if ( pagetable_val(d->exec_domain[0]->arch.pagetable) )
+        adjust(&frame_table[pagetable_val(d->exec_domain[0]->arch.pagetable)
+                           >>PAGE_SHIFT], -1, 1);
 
     list_ent = d->page_list.next;
     for ( i = 0; (list_ent != &d->page_list); i++ )
@@ -2574,10 +2575,11 @@
 
     spin_unlock(&d->page_alloc_lock);
 
-    adjust(&frame_table[pagetable_val(
-        d->exec_domain[0]->arch.pagetable)>>PAGE_SHIFT], 1, 1);
+    if ( pagetable_val(d->exec_domain[0]->arch.pagetable) )
+        adjust(&frame_table[pagetable_val(
+            d->exec_domain[0]->arch.pagetable)>>PAGE_SHIFT], 1, 1);
 
-    printk("Audit %d: Done. ctot=%d ttot=%d\n", d->id, ctot, ttot );
+    printk("Audit %d: Done. pages=%d ctot=%d ttot=%d\n", d->id, i, ctot, ttot );
 
     if ( d != current->domain )
         domain_unpause(d);