X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=7d31e6f1cf649f1d5703d3b73874548e173f1718;hb=eb7dda8d4a92a2e8d0c8f867c65317d756ca6c11;hp=e2d94c47f6ff742d4d0154d7a08d94d284f27864;hpb=a1e0475bbefa968791679c5e71232ddca522868b;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index e2d94c4..7d31e6f 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -11,7 +11,7 @@
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vmm_time.h>
-
+#include <palacios/vmm_emulator.h>
 
 typedef ullong_t v3_reg_t;
 
@@ -36,9 +36,20 @@ struct v3_ctrl_regs {
   v3_reg_t cr4;
   v3_reg_t cr8;
   v3_reg_t rflags;
+  v3_reg_t efer;
 };
 
 
+
+struct v3_dbg_regs {
+  v3_reg_t dr0;
+  v3_reg_t dr1;
+  v3_reg_t dr2;
+  v3_reg_t dr3;
+  v3_reg_t dr6;
+  v3_reg_t dr7;
+};
+
 struct v3_segment {
   ushort_t selector;
   uint_t limit;
@@ -70,20 +81,26 @@ struct v3_segments {
 struct shadow_page_state;
 struct shadow_map;
 struct vmm_io_map;
+struct emulation_state;
 
-
+/*Zheng 07/30/2008*/
 struct vm_ctrl_ops {
   int (*raise_irq)(struct guest_info * info, int irq);
+  int (*lower_irq)(struct guest_info * info, int irq);
 };
 
 
 
 
-
 typedef enum {SHADOW_PAGING, NESTED_PAGING} vmm_paging_mode_t;
-typedef enum {REAL, /*UNREAL,*/ PROTECTED, PROTECTED_PAE, LONG} vm_cpu_mode_t;
+typedef enum {VM_RUNNING, VM_STOPPED, VM_SUSPENDED, VM_ERROR, VM_EMULATING} vm_operating_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;
 
@@ -113,23 +130,30 @@ struct guest_info {
 
   struct v3_gprs vm_regs;
   struct v3_ctrl_regs ctrl_regs;
+  struct v3_dbg_regs dbg_regs;
   struct v3_segments segments;
 
   struct vm_ctrl_ops vm_ops;
 
+  struct emulation_state emulator;
 
-
+  vm_operating_mode_t run_state;
   void * vmm_data;
+
+  /* TEMP */
+  //ullong_t exit_tsc;
+
 };
 
 
+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);
 
-#else 
-
-
 #endif