more work on the memory system

[palacios.git] / palacios / include / geekos / vm_guest.h

diff --git a/palacios/include/geekos/vm_guest.h b/palacios/include/geekos/vm_guest.h
index 6a6d86b..2595de1 100644 (file)
--- a/palacios/include/geekos/vm_guest.h
+++ b/palacios/include/geekos/vm_guest.h
@@ -4,6 +4,9 @@
 #include <geekos/vmm_mem.h>
 #include <geekos/ktypes.h>
 #include <geekos/vmm_io.h>
+//#include <geekos/vmm_paging.h>
+#include <geekos/vmm_shadow_paging.h>
+
 
 struct guest_gprs {
   ullong_t rbx;
@@ -16,28 +19,33 @@ struct guest_gprs {
 };
 
 
-
+typedef enum {SHADOW_PAGING, NESTED_PAGING} vm_page_mode_t;
+typedef enum {REAL, PROTECTED, PROTECTED_PG, PROTECTED_PAE, PROTECTED_PAE_PG, LONG, LONG_PG} vm_cpu_mode_t;
 
 typedef struct guest_info {
   ullong_t rip;
   ullong_t rsp;
 
-  vmm_mem_list_t mem_list;
-  vmm_mem_layout_t mem_layout;
+  shadow_map_t mem_map;
+
+  
+  vm_page_mode_t page_mode;
+  shadow_page_state_t  shadow_page_state;
+  // nested_paging_t nested_page_state;
+
 
   vmm_io_map_t io_map;
   // device_map
 
+  vm_cpu_mode_t cpu_mode;
+
 
   struct guest_gprs vm_regs;
 
-  void * page_tables;
   void * vmm_data;
 } guest_info_t;
 
 
 
 
-
-
 #endif