X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=9475597d5d37929387b026bdd9cbc320b1c38f03;hb=6f089682a19a99474faf05f74b44f9f71f58b30b;hp=b295bfc47205c40f3f6b243031c06b94099ecd68;hpb=526ffdd06c1afb982d0d9831b99f337b6a094960;p=palacios.releases.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index b295bfc..9475597 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>
@@ -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, /*UNREAL,*/ PROTECTED, PROTECTED_PAE, LONG} vm_cpu_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 {
@@ -101,7 +102,7 @@ struct guest_info {
   // 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;
@@ -122,8 +123,11 @@ struct guest_info {
 };
 
 
-void PrintV3Segments(struct v3_segments * segs);
-void PrintV3CtrlRegs(struct v3_ctrl_regs * regs);
+void PrintV3Segments(struct guest_info * info);
+void PrintV3CtrlRegs(struct guest_info * info);
+void PrintV3GPRs(struct guest_info * info);
+
+#endif