removed unused msrs

[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 d23c823..c17fba6 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -138,7 +138,7 @@ struct guest_info {
     // This structure is how we get exceptions for the guest
     struct v3_excp_state excp_state;
 
-    v3_io_map_t io_map;
+    struct v3_io_map io_map;
 
     struct v3_msr_map msr_map;
 
@@ -150,8 +150,8 @@ struct guest_info {
 
     struct v3_host_events host_event_hooks;
 
-    v3_vm_cpu_mode_t cpu_mode;
-    v3_vm_mem_mode_t mem_mode;
+    v3_cpu_mode_t cpu_mode;
+    v3_mem_mode_t mem_mode;
     uint_t addr_width;
 
 
@@ -168,31 +168,16 @@ struct guest_info {
     struct v3_profiler profiler;
 
     void * decoder_state;
-
-    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;
-
-
 };
 
 
 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);
+v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info);
+v3_mem_mode_t v3_get_vm_mem_mode(struct guest_info * info);
 
 
-const uchar_t * v3_cpu_mode_to_str(v3_vm_cpu_mode_t mode);
-const uchar_t * v3_mem_mode_to_str(v3_vm_mem_mode_t mode);
+const uchar_t * v3_cpu_mode_to_str(v3_cpu_mode_t mode);
+const uchar_t * v3_mem_mode_to_str(v3_mem_mode_t mode);
 
 
 void v3_print_segments(struct guest_info * info);