X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_shadow_paging.h;h=cd0cb7a4596f4cf94950c0d489dd91b3dbe16e90;hp=07c15f540a18ae12874f772b978f64f61b6c4b70;hb=0e097100a26bc43eb8964734fa43130fc4c71429;hpb=7cdedeb7a01b51c5242cce94924f2ea246008e7d

diff --git a/palacios/include/palacios/vmm_shadow_paging.h b/palacios/include/palacios/vmm_shadow_paging.h
index 07c15f5..cd0cb7a 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__
@@ -26,28 +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 {
 
-  // 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;
+    v3_msr_t guest_efer;
 
-  // these two reflect the top-level page directory 
-  // of the shadow page table
-  paging_mode_t           shadow_mode;
-  ullong_t                shadow_cr3;
+    // 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
 
 };
 
@@ -56,22 +52,17 @@ struct shadow_page_state {
 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_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);
-int v3_replace_shdw_page32(struct guest_info * info, addr_t location, pte32_t * new_page, pte32_t * old_page); 
-
 #endif // ! __V3VEE__
 
 #endif