code clean up

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

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 2582cf0..e2d94c4 100644 (file)
--- 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>
@@ -69,6 +69,7 @@ struct v3_segments {
 
 struct shadow_page_state;
 struct shadow_map;
+struct vmm_io_map;
 
 
 struct vm_ctrl_ops {
@@ -80,7 +81,7 @@ struct vm_ctrl_ops {
 
 
 typedef enum {SHADOW_PAGING, NESTED_PAGING} vmm_paging_mode_t;
-typedef enum {REAL, PROTECTED, PROTECTED_PAE, LONG} vm_cpu_mode_t;
+typedef enum {REAL, /*UNREAL,*/ PROTECTED, PROTECTED_PAE, LONG} vm_cpu_mode_t;
 typedef enum {PHYSICAL_MEM, VIRTUAL_MEM} vm_mem_mode_t;
 
 struct guest_info {
@@ -94,13 +95,14 @@ struct guest_info {
   
   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;
@@ -121,6 +123,14 @@ struct guest_info {
 };
 
 
+void PrintV3Segments(struct guest_info * info);
+void PrintV3CtrlRegs(struct guest_info * info);
+void PrintV3GPRs(struct guest_info * info);
+
+#else 
+
+
+#endif