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

diff --git a/palacios/include/palacios/vmm_shadow_paging.h b/palacios/include/palacios/vmm_shadow_paging.h
index b2b3d1e..d7629a1 100644
--- a/palacios/include/palacios/vmm_shadow_paging.h
+++ b/palacios/include/palacios/vmm_shadow_paging.h
@@ -26,24 +26,27 @@
 #include <palacios/vmm_util.h>
 #include <palacios/vmm_paging.h>
 #include <palacios/vmm_hashtable.h>
+#include <palacios/vmm_list.h>
+#include <palacios/vmm_msr.h>
 
 
 struct shadow_page_state {
+    // ugly optimization hack
+    v3_reg_t prev_guest_cr3;
 
-  // 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;
+    // virtualized control registers
+    v3_reg_t guest_cr3;
+    v3_reg_t guest_cr0;
+    v3_msr_t guest_efer;
 
+    // list of allocated shadow pages
+    struct list_head page_list;
 
-  // Hash table that ties a CR3 value to a hash table pointer for the PT entries
-  struct hashtable *  cr3_cache;
-  // Hash table that contains a mapping of guest pte addresses to host pte addresses
-  struct hashtable *  cached_ptes;
-  addr_t cached_cr3;
+
+#ifdef CONFIG_SHADOW_PAGING_TELEMETRY
+    uint_t guest_faults;
+#endif
 
 };
 
@@ -52,31 +55,17 @@ struct shadow_page_state {
 struct guest_info;
 
 
-
-
-
 int v3_init_shadow_page_state(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_invalidate_shadow_pts(struct guest_info * info);
 
 
-/* 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__
 
 #endif