[Xen-changelog] [xen-unstable] [XEN] remove unused monitor_vtable mapping.

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

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Node ID 963a02c040f64b6efc24d72dda4ae53a61f96cea
# Parent  26a3c7c1078243b682fdb703fc2b652919991be9
[XEN] remove unused monitor_vtable mapping.
Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/common.c |    8 +++-----
 xen/include/asm-x86/domain.h    |    1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff -r 26a3c7c10782 -r 963a02c040f6 xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c   Wed Dec 06 11:25:51 2006 +0000
+++ b/xen/arch/x86/mm/shadow/common.c   Wed Dec 06 12:13:22 2006 +0000
@@ -2433,11 +2433,10 @@ void sh_update_paging_modes(struct vcpu 
                 }
         }
 
-        if ( pagetable_get_pfn(v->arch.monitor_table) == 0 )
+        if ( pagetable_is_null(v->arch.monitor_table) )
         {
             mfn_t mmfn = shadow_make_monitor_table(v);
             v->arch.monitor_table = pagetable_from_mfn(mmfn);
-            v->arch.monitor_vtable = sh_map_domain_page(mmfn);
         } 
 
         if ( v->arch.shadow.mode != old_mode )
@@ -2467,12 +2466,10 @@ void sh_update_paging_modes(struct vcpu 
                     return;
                 }
 
-                sh_unmap_domain_page(v->arch.monitor_vtable);
                 old_mfn = pagetable_get_mfn(v->arch.monitor_table);
                 v->arch.monitor_table = pagetable_null();
                 new_mfn = v->arch.shadow.mode->make_monitor_table(v);          
  
                 v->arch.monitor_table = pagetable_from_mfn(new_mfn);
-                v->arch.monitor_vtable = sh_map_domain_page(new_mfn);
                 SHADOW_PRINTK("new monitor table %"SH_PRI_mfn "\n",
                                mfn_x(new_mfn));
 
@@ -3272,7 +3269,8 @@ void shadow_audit_p2m(struct domain *d)
 
     //SHADOW_PRINTK("p2m audit starts\n");
 
-    test_linear = ( (d == current->domain) && current->arch.monitor_vtable );
+    test_linear = ( (d == current->domain) 
+                    && !pagetable_is_null(current->arch.monitor_table) );
     if ( test_linear )
         local_flush_tlb(); 
 
diff -r 26a3c7c10782 -r 963a02c040f6 xen/include/asm-x86/domain.h
--- a/xen/include/asm-x86/domain.h      Wed Dec 06 11:25:51 2006 +0000
+++ b/xen/include/asm-x86/domain.h      Wed Dec 06 12:13:22 2006 +0000
@@ -196,7 +196,6 @@ struct arch_vcpu
     unsigned long cr3;                     /* (MA) value to install in HW CR3 
*/
 
     void *guest_vtable;                 /* virtual addr of pagetable */
-    root_pgentry_t *monitor_vtable;            /* virtual addr of 
monitor_table */
 
     /* Current LDT details. */
     unsigned long shadow_ldt_mapcnt;

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