X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_shadow_paging.h;h=bea54aa68909ca117cdcd02a79c9262d3baab6a5;hb=9526410ca7474542623aa2e74b2ce001dd7ec55e;hp=330f7abd266fe580352b38bedc719a6f6d0f7860;hpb=101529b6eae500272347287df43ec51aa003d0aa;p=palacios.git

diff --git a/palacios/include/palacios/vmm_shadow_paging.h b/palacios/include/palacios/vmm_shadow_paging.h
index 330f7ab..bea54aa 100644
--- a/palacios/include/palacios/vmm_shadow_paging.h
+++ b/palacios/include/palacios/vmm_shadow_paging.h
@@ -1,8 +1,24 @@
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
-
-#ifndef __VMM_SHADOW_PAGING_H
-#define __VMM_SHADOW_PAGING_H
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
+#ifndef __VMM_SHADOW_PAGING_H__
+#define __VMM_SHADOW_PAGING_H__
 
 
 #ifdef __V3VEE__
@@ -11,24 +27,23 @@
 #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
+  // virtualized control registers
+  v3_reg_t guest_cr3;
+  v3_reg_t guest_cr0;
 
-  // Should this be here??
-  ullong_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;
 
 
-  // Hash table that ties a CR3 value to a hash table pointer for the PT entries
+  // 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;
@@ -41,20 +56,28 @@ 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_replace_shdw_page(struct guest_info * info, addr_t location, void * new_page, void* old_page);
+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_replace_shdw_page(struct guest_info * info, addr_t location, void * new_page, void * old_page);
 
 #endif // ! __V3VEE__