X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=5e182449f6a6213c33ed2331b6e392fce60eb908;hb=313214f2f4c8cf8d4bb4e2e3aaa788101d955fce;hp=9871d3adee147f6b28649d7981b39fabe70be0d9;hpb=b580d9fca65a7b6f84eaebb57cad09bc6e941dfd;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 9871d3a..5e18244 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -36,17 +36,26 @@
 #include <palacios/vmm_hypercall.h>
 #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>
+#include <palacios/vmm_exits.h>
+#include <palacios/vmm_events.h>
 
-#ifdef CONFIG_TELEMETRY
+#include <palacios/vmm_perftune.h>
+
+#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
 
+
+
 #include <palacios/vmm_config.h>
 
 struct v3_intr_state;
@@ -62,7 +71,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,6 +104,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;
@@ -102,7 +113,7 @@ struct guest_info {
     
     uint64_t num_exits;
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     struct v3_core_telemetry core_telem;
 #endif
 
@@ -111,7 +122,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
@@ -123,8 +134,14 @@ 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;
+
 };
 
 
@@ -139,8 +156,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;
@@ -148,6 +163,8 @@ struct v3_vm_info {
     struct v3_io_map io_map;
     struct v3_msr_map msr_map;
     struct v3_cpuid_map cpuid_map;
+    struct v3_exit_map exit_map;
+    struct v3_event_map event_map;
 
     v3_hypercall_map_t hcall_map;
 
@@ -157,24 +174,32 @@ 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;
 
-#ifdef CONFIG_SYMBIOTIC
+    struct v3_barrier barrier;
+
+
+    struct v3_extensions extensions;
+
+    struct v3_perf_options perf_options;
+
+#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
 
+
     uint64_t yield_cycle_period;  
 
 
@@ -189,6 +214,9 @@ struct v3_vm_info {
 int v3_init_vm(struct v3_vm_info * vm);
 int v3_init_core(struct guest_info * core);
 
+int v3_free_vm_internal(struct v3_vm_info * vm);
+int v3_free_core(struct guest_info * core);
+
 
 uint_t v3_get_addr_width(struct guest_info * info);
 v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info);
@@ -198,17 +226,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);
+#endif /* ! __V3VEE__ */
 
-void v3_print_stack(struct guest_info * info);
 
-#endif /* ! __V3VEE__ */
 
 #endif