X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=fb91c1dfaace1e18df2e198a049e99b9152bb353;hb=5ed7ab7d688c249301404ced123d6d8ee1b0711a;hp=b427f5a84062241a8ecf3d3428c77aa2e65182da;hpb=dc6b47d05e37e6c3738e1bc6165ec4a107717d2b;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index b427f5a..fb91c1d 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -37,23 +37,20 @@
 #include <palacios/vmm_cpuid.h>
 #include <palacios/vmm_regs.h>
 #include <palacios/vmm_extensions.h>
+#include <palacios/vmm_barrier.h>
+#include <palacios/vmm_timeout.h>
 
 
-
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
 #include <palacios/vmm_telemetry.h>
 #endif
 
 
-#ifdef CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
 #include <palacios/vmm_symbiotic.h>
 struct v3_sym_core_state;
 #endif
 
-#ifdef CONFIG_SYSCALL_HIJACK
-#include <palacios/vmm_syscall_hijack.h>
-#endif
-
 
 
 #include <palacios/vmm_config.h>
@@ -71,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;
@@ -94,11 +92,6 @@ struct guest_info {
     /* This structure is how we get exceptions for the guest */
     struct v3_excp_state excp_state;
 
-#ifdef CONFIG_SYSCALL_HIJACK
-    struct v3_syscall_hook_map sc_hook_map;
-    struct v3_execve_varchunk var_dump;
-#endif
-
 
     v3_cpu_mode_t cpu_mode;
     v3_mem_mode_t mem_mode;
@@ -108,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;
@@ -116,7 +110,7 @@ struct guest_info {
     
     uint64_t num_exits;
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     struct v3_core_telemetry core_telem;
 #endif
 
@@ -125,7 +119,7 @@ struct guest_info {
 
     void * decoder_state;
 
-#ifdef CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
     /* Symbiotic state */
     struct v3_sym_core_state sym_core_state;
 #endif
@@ -137,8 +131,13 @@ struct guest_info {
 
     v3_core_operating_mode_t core_run_state;
 
+    void * core_thread; /* thread struct for virtual core */
+
     /* the logical cpu on which this core runs */
-    uint32_t cpu_id;
+    uint32_t pcpu_id;
+    
+    /* The virtual core # of this cpu (what the guest sees this core as) */
+    uint32_t vcpu_id;
      
 };
 
@@ -154,8 +153,6 @@ struct v3_vm_info {
     uint32_t mem_align;
     struct v3_mem_map mem_map;
 
-    v3_paging_size_t paging_size; // for nested paging
-
     struct v3_mem_hooks mem_hooks;
 
     struct v3_shdw_impl_state shdw_impl;
@@ -172,23 +169,25 @@ 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;
 
     v3_vm_operating_mode_t run_state;
 
-
+    struct v3_barrier barrier;
 
 
     struct v3_extensions extensions;
 
-#ifdef CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
     /* Symbiotic state */
     struct v3_sym_vm_state sym_vm_state;
 #endif
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     uint_t enable_telemetry;
     struct v3_telemetry_state telemetry;
 #endif
@@ -220,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