X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=fb91c1dfaace1e18df2e198a049e99b9152bb353;hb=06ad2088c1bf59d4d6d11986d4de2195e64baaac;hp=eae4bd7ad407d9778a1d187cece7b5cadba6c58d;hpb=8e9c13c41b0244a8d0029e837a623591a22c5879;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index eae4bd7..fb91c1d 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -38,6 +38,7 @@
 #include <palacios/vmm_regs.h>
 #include <palacios/vmm_extensions.h>
 #include <palacios/vmm_barrier.h>
+#include <palacios/vmm_timeout.h>
 
 
 #ifdef V3_CONFIG_TELEMETRY
@@ -67,7 +68,8 @@ struct guest_info {
 
     uint_t cpl;
 
-    struct vm_time time_state;
+    struct vm_core_time time_state;
+    struct v3_core_timeouts timeouts;
 
     v3_paging_mode_t shdw_pg_mode;
     struct v3_shdw_pg_state shdw_pg_state;
@@ -99,6 +101,7 @@ struct guest_info {
     struct v3_ctrl_regs ctrl_regs;
     struct v3_dbg_regs dbg_regs;
     struct v3_segments segments;
+    struct v3_msrs     msrs;
 
 
     void * vmm_data;
@@ -128,9 +131,6 @@ struct guest_info {
 
     v3_core_operating_mode_t core_run_state;
 
-    v3_core_moving_state_t core_move_state;  /* if 1, then it is to be migrated to current pcpu_id */
-    uint32_t target_pcpu_id; /* the target physical CPU id for core moving */
-
     void * core_thread; /* thread struct for virtual core */
 
     /* the logical cpu on which this core runs */
@@ -169,6 +169,8 @@ struct v3_vm_info {
     /* device_map */
     struct vmm_dev_mgr  dev_mgr;
 
+    struct v3_time time_state;
+
     struct v3_host_events host_event_hooks;
 
     struct v3_config * cfg_data;
@@ -217,19 +219,10 @@ v3_mem_mode_t v3_get_vm_mem_mode(struct guest_info * info);
 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);
 
-int v3_translate_segment(struct guest_info * info, uint16_t selector, struct v3_segment * seg);
-
 
-void v3_print_guest_state(struct guest_info * info);
-
-void v3_print_segments(struct v3_segments * segs);
-void v3_print_ctrl_regs(struct guest_info * info);
-void v3_print_GPRs(struct guest_info * info);
-
-void v3_print_stack(struct guest_info * info);
 
 #endif /* ! __V3VEE__ */
 
-void v3_print_guest_state_all(struct v3_vm_info * vm);
+
 
 #endif