X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=0987f95142e96798e33a12c561d3e8feeb9bd95e;hb=90b8236597004a37a9d5acb33a1b1f987fe9070c;hp=56245efd1fd4bcec08d6576297beefd6a9b5201f;hpb=2b1f4ef19d766727f873476861c64339c8836a40;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 56245ef..0987f95 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -10,41 +10,69 @@
 #include <palacios/vmm_shadow_paging.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_dev_mgr.h>
-#include <palacios/vmm_irq.h>
-
-
-typedef ullong_t gpr_t;
-
-/*
-  struct guest_gprs {
-  addr_t rax;
-  addr_t rbx;
-  addr_t rcx;
-  addr_t rdx;
-  addr_t rsi;
-  addr_t rdi;
-  addr_t rbp;
-  };
-*/
-
-struct guest_gprs {
-  gpr_t rdi;
-  gpr_t rsi;
-  gpr_t rbp;
-  gpr_t rsp;
-  gpr_t rbx;
-  gpr_t rdx;
-  gpr_t rcx;
-  gpr_t rax;
+#include <palacios/vmm_time.h>
+
+
+typedef ullong_t v3_reg_t;
+
+
+
+struct v3_gprs {
+  v3_reg_t rdi;
+  v3_reg_t rsi;
+  v3_reg_t rbp;
+  v3_reg_t rsp;
+  v3_reg_t rbx;
+  v3_reg_t rdx;
+  v3_reg_t rcx;
+  v3_reg_t rax;
+};
+
+
+struct v3_ctrl_regs {
+  v3_reg_t cr0;
+  v3_reg_t cr2;
+  v3_reg_t cr3;
+  v3_reg_t cr4;
+  v3_reg_t cr8;
+  v3_reg_t rflags;
+};
+
+
+struct v3_segment {
+  ushort_t selector;
+  uint_t limit;
+  ullong_t base;
+  uint_t type           : 4;
+  uint_t system         : 1;
+  uint_t dpl            : 2;
+  uint_t present        : 1;
+  uint_t avail          : 1;
+  uint_t long_mode      : 1;
+  uint_t db             : 1;
+  uint_t granularity    : 1;
 };
 
 
+struct v3_segments {
+  struct v3_segment cs;
+  struct v3_segment ds;
+  struct v3_segment es;
+  struct v3_segment fs;
+  struct v3_segment gs;
+  struct v3_segment ss;
+  struct v3_segment ldtr;
+  struct v3_segment gdtr;
+  struct v3_segment idtr;
+  struct v3_segment tr;
+};
+
 struct shadow_page_state;
 struct shadow_map;
 
 
 struct vm_ctrl_ops {
-  int (*raise_irq)(struct guest_info * info, int irq, int error_code);
+  int (*raise_irq)(struct guest_info * info, int irq);
 };
 
 
@@ -58,8 +86,12 @@ 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;
   struct shadow_page_state shdw_pg_state;
@@ -69,8 +101,6 @@ struct guest_info {
   // This structure is how we get interrupts for the guest
   struct vm_intr intr_state;
 
-
-  // struct vmm_irq_map irq_map;
   vmm_io_map_t io_map;
   // device_map
 
@@ -79,10 +109,14 @@ struct guest_info {
   vm_cpu_mode_t cpu_mode;
 
 
-  struct guest_gprs vm_regs;
+  struct v3_gprs vm_regs;
+  struct v3_ctrl_regs ctrl_regs;
+  struct v3_segments segments;
 
   struct vm_ctrl_ops vm_ops;
 
+
+
   void * vmm_data;
 };