X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_shadow_paging.h;h=b2b3d1e82d8b59f5a32506e02671eec2d8482fb8;hb=f1d070a7d98fea4d37069555d653e37524f50ac8;hp=f7424e8dadcd8320a3937630d5a376f8c43fbba1;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72;p=palacios.git

diff --git a/palacios/include/palacios/vmm_shadow_paging.h b/palacios/include/palacios/vmm_shadow_paging.h
index f7424e8..b2b3d1e 100644
--- a/palacios/include/palacios/vmm_shadow_paging.h
+++ b/palacios/include/palacios/vmm_shadow_paging.h
@@ -17,8 +17,8 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __VMM_SHADOW_PAGING_H
-#define __VMM_SHADOW_PAGING_H
+#ifndef __VMM_SHADOW_PAGING_H__
+#define __VMM_SHADOW_PAGING_H__
 
 
 #ifdef __V3VEE__
@@ -27,20 +27,16 @@
 #include <palacios/vmm_paging.h>
 #include <palacios/vmm_hashtable.h>
 
-struct shadow_page_state {
 
-  // these two reflect the top-level page directory
-  // of the guest page table
-  paging_mode_t           guest_mode;
-  ullong_t                guest_cr3;         // points to guest's current page table
+struct shadow_page_state {
 
-  // Should this be here??
-  ullong_t guest_cr0;
+  // 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
-  paging_mode_t           shadow_mode;
-  ullong_t                shadow_cr3;
+  // v3_reg_t                shadow_cr3;
 
 
   // Hash table that ties a CR3 value to a hash table pointer for the PT entries
@@ -57,20 +53,29 @@ struct guest_info;
 
 
 
-int cache_page_tables32(struct guest_info * info, addr_t  pde);
 
-int init_shadow_page_state(struct guest_info * info);
 
-addr_t create_new_shadow_pt32();
+int v3_init_shadow_page_state(struct guest_info * info);
+
+
 
-int handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
-int handle_shadow_invlpg(struct guest_info * info);
+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__