cleaned up emulation interface

[palacios.git] / palacios / include / palacios / vm_guest.h

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 9987fe5..46fe9f9 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -29,7 +29,6 @@
 #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>
@@ -108,7 +107,6 @@ struct v3_segments {
 } ;
 
 struct shadow_page_state;
-struct emulation_state;
 struct v3_intr_state;
 struct v3_profiler;
 
@@ -139,8 +137,8 @@ struct guest_info {
   v3_io_map_t io_map;
 
   struct v3_msr_map msr_map;
-  // device_map
 
+  // device_map
   struct vmm_dev_mgr  dev_mgr;
 
   struct v3_host_events host_event_hooks;
@@ -163,17 +161,14 @@ struct guest_info {
 
   void * decoder_state;
 
-  struct v3_msr guest_efer;
-
-
-  struct v3_msr shadow_cstar;
-  struct v3_msr shadow_star;
-  struct v3_msr shadow_lstar;
-  struct v3_msr shadow_syscall_mask;
-  
+  v3_msr_t guest_efer;
 
-  /* TEMP */
-  //ullong_t exit_tsc;
+  /* 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;
 
 };