X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=8b2104e5dd0b3dfb259e65cf78f378114cb38be7;hb=09ff0bf8fd1eba63b83e1232828f9e99b89eeecc;hp=7871eb031170e5bc6ebfd6aedfe5ea918a6a081c;hpb=362391accc505b29d938e9d0a21bf6a28a8cee34;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 7871eb0..8b2104e 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -29,10 +29,10 @@
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vmm_time.h>
-#include <palacios/vmm_emulator.h>
 #include <palacios/vmm_host_events.h>
 #include <palacios/vmm_msr.h>
 #include <palacios/vmm_profiler.h>
+#include <palacios/vmm_hypercall.h>
 
 
 
@@ -45,7 +45,17 @@ struct v3_gprs {
   v3_reg_t rdx;
   v3_reg_t rcx;
   v3_reg_t rax;
-};
+
+  v3_reg_t r8;
+  v3_reg_t r9;
+  v3_reg_t r10;
+  v3_reg_t r11;
+  v3_reg_t r12;
+  v3_reg_t r13;
+  v3_reg_t r14;
+  v3_reg_t r15;
+  
+} __attribute__((packed));
 
 
 struct v3_ctrl_regs {
@@ -81,7 +91,7 @@ struct v3_segment {
   uint_t long_mode      : 1;
   uint_t db             : 1;
   uint_t granularity    : 1;
-};
+} __attribute__((packed));
 
 
 struct v3_segments {
@@ -98,7 +108,6 @@ struct v3_segments {
 };
 
 struct shadow_page_state;
-struct emulation_state;
 struct v3_intr_state;
 struct v3_profiler;
 
@@ -110,7 +119,7 @@ struct guest_info {
 
   uint_t cpl;
 
-  addr_t mem_size; // Probably in bytes for now....
+  addr_t mem_size; // In bytes for now
   v3_shdw_map_t mem_map;
 
 
@@ -129,14 +138,18 @@ struct guest_info {
   v3_io_map_t io_map;
 
   struct v3_msr_map msr_map;
-  // device_map
 
+
+  v3_hypercall_map_t hcall_map;
+
+  // device_map
   struct vmm_dev_mgr  dev_mgr;
 
   struct v3_host_events host_event_hooks;
 
   v3_vm_cpu_mode_t cpu_mode;
   v3_vm_mem_mode_t mem_mode;
+  uint_t addr_width;
 
 
   struct v3_gprs vm_regs;
@@ -153,14 +166,25 @@ struct guest_info {
 
   void * decoder_state;
 
-  struct v3_msr guest_efer;
+  v3_msr_t guest_efer;
+
+  /* Do we need these ? */
+  v3_msr_t guest_star;
+  v3_msr_t guest_lstar;
+  v3_msr_t guest_cstar;
+  v3_msr_t guest_syscall_mask;
+  v3_msr_t guest_gs_base;
+
+
+  uint64_t fs;
+  uint64_t gs;
+
 
-  /* TEMP */
-  //ullong_t exit_tsc;
 
 };
 
 
+uint_t v3_get_addr_width(struct guest_info * info);
 v3_vm_cpu_mode_t v3_get_cpu_mode(struct guest_info * info);
 v3_vm_mem_mode_t v3_get_mem_mode(struct guest_info * info);