various changes...

[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 bea54aa..cd0cb7a 100644 (file)
--- a/palacios/include/palacios/vmm_shadow_paging.h
+++ b/palacios/include/palacios/vmm_shadow_paging.h
@@ -26,27 +26,24 @@
 #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 {
 
-  // virtualized control registers
-  v3_reg_t guest_cr3;
-  v3_reg_t guest_cr0;
+    // 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;
 
 
-
-  // 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;
+#ifdef CONFIG_SHADOW_PAGING_TELEMETRY
+    uint_t guest_faults;
+#endif
 
 };
 
@@ -55,29 +52,16 @@ 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_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_invalidate_shadow_pts(struct guest_info * info);
 
-int v3_replace_shdw_page(struct guest_info * info, addr_t location, void * new_page, void * old_page);
 
 #endif // ! __V3VEE__