X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=684af4da26024cfccfc09b5900189ec1551c9d9b;hb=07820ee58e9b356341ce86cd2b2938d3abef60c9;hp=0987f95142e96798e33a12c561d3e8feeb9bd95e;hpb=d8fc6aa4bc2a5d9cec50923e9d2bd30f867dd50a;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 0987f95..684af4d 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -1,7 +1,7 @@
 #ifndef __VM_GUEST_H
 #define __VM_GUEST_H
 
-
+#ifdef __V3VEE__
 
 
 #include <palacios/vmm_mem.h>
@@ -36,6 +36,7 @@ struct v3_ctrl_regs {
   v3_reg_t cr4;
   v3_reg_t cr8;
   v3_reg_t rflags;
+  v3_reg_t efer;
 };
 
 
@@ -69,6 +70,7 @@ struct v3_segments {
 
 struct shadow_page_state;
 struct shadow_map;
+struct vmm_io_map;
 
 
 struct vm_ctrl_ops {
@@ -79,34 +81,35 @@ struct vm_ctrl_ops {
 
 
 
-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 enum {SHADOW_PAGING, NESTED_PAGING} vmm_paging_mode_t;
+typedef enum {REAL, /*UNREAL,*/ PROTECTED, PROTECTED_PAE, LONG, LONG_32_COMPAT, LONG_16_COMPAT} vm_cpu_mode_t;
+typedef enum {PHYSICAL_MEM, VIRTUAL_MEM} vm_mem_mode_t;
 
 struct guest_info {
   ullong_t rip;
 
-
   uint_t cpl;
 
-
   struct shadow_map mem_map;
 
   struct vm_time time_state;
   
-  vm_page_mode_t page_mode;
+  vmm_paging_mode_t shdw_pg_mode;
   struct shadow_page_state shdw_pg_state;
+  addr_t direct_map_pt;
   // nested_paging_t nested_page_state;
 
 
   // This structure is how we get interrupts for the guest
   struct vm_intr intr_state;
 
-  vmm_io_map_t io_map;
+  struct vmm_io_map io_map;
   // device_map
 
   struct vmm_dev_mgr  dev_mgr;
 
   vm_cpu_mode_t cpu_mode;
+  vm_mem_mode_t mem_mode;
 
 
   struct v3_gprs vm_regs;
@@ -121,6 +124,15 @@ struct guest_info {
 };
 
 
+vm_cpu_mode_t get_cpu_mode(struct guest_info * info);
+vm_mem_mode_t get_mem_mode(struct guest_info * info);
+
+
+void PrintV3Segments(struct guest_info * info);
+void PrintV3CtrlRegs(struct guest_info * info);
+void PrintV3GPRs(struct guest_info * info);
+
+#endif