X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_shadow_paging.h;h=bea54aa68909ca117cdcd02a79c9262d3baab6a5;hb=24178516ccd9f46718b687d4c630415eb63ff595;hp=cb04d7d8b86ceace0bdc612c9d4a1255503bd010;hpb=0899a5c74318e582f3d6ebec52cc744cdb727734;p=palacios.releases.git

diff --git a/palacios/include/palacios/vmm_shadow_paging.h b/palacios/include/palacios/vmm_shadow_paging.h
index cb04d7d..bea54aa 100644
--- a/palacios/include/palacios/vmm_shadow_paging.h
+++ b/palacios/include/palacios/vmm_shadow_paging.h
@@ -30,20 +30,20 @@
 
 struct shadow_page_state {
 
-  // these two reflect the top-level page directory
-  // of the guest page table
-  v3_reg_t                guest_cr3;         // points to guest's current page table
-
-  // Should this be here??
+  // virtualized control registers
+  v3_reg_t guest_cr3;
   v3_reg_t guest_cr0;
 
-  // these two reflect the top-level page directory 
-  // of the shadow page table
-  v3_reg_t                shadow_cr3;
 
 
-  // Hash table that ties a CR3 value to a hash table pointer for the PT entries
+
+  // Page table struct lookup table
+  struct hashtable * pt_cache;
+
+  // Guest CR3 to Shadow CR3 Lookup Table
   struct hashtable *  cr3_cache;
+
+  /* SOON TO BE DEPRECATED */
   // Hash table that contains a mapping of guest pte addresses to host pte addresses
   struct hashtable *  cached_ptes;
   addr_t cached_cr3;
@@ -56,20 +56,28 @@ struct guest_info;
 
 
 
-int v3_cache_page_tables32(struct guest_info * info, addr_t  pde);
+
 
 int v3_init_shadow_page_state(struct guest_info * info);
 
-addr_t v3_create_new_shadow_pt32();
+
 
 int v3_handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
 int v3_handle_shadow_invlpg(struct guest_info * info);
 
 
+int v3_activate_shadow_pt(struct guest_info * info);
+int v3_activate_passthrough_pt(struct guest_info * info);
+
+/* TODO: Change to static functions
+ * External visibility not needed
+ */
+addr_t v3_create_new_shadow_pt();
+int v3_replace_shdw_page32(struct guest_info * info, addr_t location, pte32_t * new_page, pte32_t * old_page); 
+/* *** */
 
 
 int v3_replace_shdw_page(struct guest_info * info, addr_t location, void * new_page, void * old_page);
-int v3_replace_shdw_page32(struct guest_info * info, addr_t location, pte32_t * new_page, pte32_t * old_page); 
 
 #endif // ! __V3VEE__