restructured the ctrl register handlers

[palacios.git] / palacios / include / palacios / vmm_shadow_paging.h

diff --git a/palacios/include/palacios/vmm_shadow_paging.h b/palacios/include/palacios/vmm_shadow_paging.h
index 46b60ef..b2b3d1e 100644 (file)
--- a/palacios/include/palacios/vmm_shadow_paging.h
+++ b/palacios/include/palacios/vmm_shadow_paging.h
@@ -30,16 +30,13 @@
 
 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;
+  // v3_reg_t                shadow_cr3;
 
 
   // Hash table that ties a CR3 value to a hash table pointer for the PT entries
@@ -56,20 +53,29 @@ 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_pt();
+
 
 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_replace_shdw_page(struct guest_info * info, addr_t location, void * new_page, void * old_page);
+/* TODO: Change to static functions
+ * External visibility not needed
+ */
+addr_t v3_create_new_shadow_pt();
+int v3_cache_page_tables32(struct guest_info * info, addr_t  pde);
 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);
 
 #endif // ! __V3VEE__