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=bdf01140425c611476dca5b4f9f0fe969b0733ac;hb=0e097100a26bc43eb8964734fa43130fc4c71429;hpb=41d6dcb0a638ebdc01b89a9edf427c75975b2003

diff --git a/palacios/include/palacios/vmm_shadow_paging.h b/palacios/include/palacios/vmm_shadow_paging.h
index bdf0114..cd0cb7a 100644
--- a/palacios/include/palacios/vmm_shadow_paging.h
+++ b/palacios/include/palacios/vmm_shadow_paging.h
@@ -1,26 +1,49 @@
-#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__
 
 #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
+    // virtualized control registers
+    v3_reg_t guest_cr3;
+    v3_reg_t guest_cr0;
+    v3_msr_t guest_efer;
 
-  // Should this be here??
-  reg_ex_t                guest_cr0;
+    // list of allocated shadow pages
+    struct list_head page_list;
 
-  // these two reflect the top-level page directory 
-  // of the shadow page table
-  paging_mode_t           shadow_mode;
-  ullong_t                shadow_cr3;
 
+#ifdef CONFIG_SHADOW_PAGING_TELEMETRY
+    uint_t guest_faults;
+#endif
 
 };
 
@@ -29,32 +52,17 @@ struct shadow_page_state {
 struct guest_info;
 
 
-int init_shadow_page_state(struct shadow_page_state * state);
-
-
-addr_t create_new_shadow_pt32(struct guest_info * info);
-
-addr_t setup_shadow_pt32(struct guest_info * info, addr_t virt_cr3);
-addr_t setup_shadow_pte32(struct guest_info * info, addr_t pt_host_addr);
-
-int handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
-int handle_shadow_pagefault32(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
+int v3_init_shadow_page_state(struct guest_info * info);
 
-int handle_shadow_pde32_fault(struct guest_info * info, 
-			      addr_t fault_addr, 
-			      pf_error_t error_code, 
-			      pde32_t * shadow_pde, 
-			      pde32_t * guest_pde);
 
+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 handle_shadow_pte32_fault(struct guest_info* info, 
-			      addr_t fault_addr, 
-			      pf_error_t error_code,
-			      pte32_t * shadow_pte, 
-			      pte32_t * guest_pte);
 
+int v3_activate_shadow_pt(struct guest_info * info);
+int v3_invalidate_shadow_pts(struct guest_info * info);
 
 
-int handle_shadow_invlpg(struct guest_info * info);
+#endif // ! __V3VEE__
 
 #endif