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

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 684af4d..224bc33 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -1,3 +1,6 @@
+/* Northwestern University */
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+
 #ifndef __VM_GUEST_H
 #define __VM_GUEST_H
 
@@ -11,7 +14,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;
 
@@ -40,6 +43,16 @@ struct v3_ctrl_regs {
 };
 
 
+
+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;
@@ -71,20 +84,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 {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;
 
@@ -114,13 +133,19 @@ 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;
+
 };