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

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index fb91c1d..a4fca43 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -27,6 +27,7 @@
 #include <palacios/vmm_mem_hook.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_shadow_paging.h>
+#include <palacios/vmm_direct_paging.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_excp.h>
 #include <palacios/vmm_dev_mgr.h>
@@ -39,18 +40,35 @@
 #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>
+#include <palacios/vmm_scheduler.h>
+#include <palacios/vmm_fw_cfg.h>
+#include <palacios/vmm_fp.h>
+#include <palacios/vmm_perftune.h>
 
 
 #ifdef V3_CONFIG_TELEMETRY
 #include <palacios/vmm_telemetry.h>
 #endif
 
+#ifdef V3_CONFIG_PMU_TELEMETRY
+#include <palacios/vmm_pmu_telemetry.h>
+#endif
+
+#ifdef V3_CONFIG_PWRSTAT_TELEMETRY
+#include <palacios/vmm_pwrstat_telemetry.h>
+#endif
 
 #ifdef V3_CONFIG_SYMBIOTIC
 #include <palacios/vmm_symbiotic.h>
 struct v3_sym_core_state;
 #endif
 
+#ifdef V3_CONFIG_MEM_TRACK
+#include <palacios/vmm_mem_track.h>
+#endif
+
 
 
 #include <palacios/vmm_config.h>
@@ -70,10 +88,19 @@ struct guest_info {
 
     struct vm_core_time time_state;
     struct v3_core_timeouts timeouts;
+    void * sched_priv_data;
 
     v3_paging_mode_t shdw_pg_mode;
+    // arch-independent state of shadow pager
     struct v3_shdw_pg_state shdw_pg_state;
+    // arch-indepedent state of the passthrough pager
     addr_t direct_map_pt;
+    // arch-independent state of the nested pager (currently none)
+    // struct v3_nested_pg_state nested_pg_state;
+    // per-core state of the swapper (currently none)
+    //#ifdef V3_CONFIG_SWAPPING
+    //   struct v3_swap_impl_state swap_impl;
+    //#endif
     
 
     union {
@@ -103,7 +130,9 @@ struct guest_info {
     struct v3_segments segments;
     struct v3_msrs     msrs;
 
+    struct v3_fp_state fp_state;
 
+    // the arch-dependent state (SVM or VMX)
     void * vmm_data;
 
     uint64_t yield_start_cycle;
@@ -114,7 +143,17 @@ struct guest_info {
     struct v3_core_telemetry core_telem;
 #endif
 
+#ifdef V3_CONFIG_PMU_TELEMETRY
+    struct v3_core_pmu_telemetry pmu_telem;
+#endif
+
+#ifdef V3_CONFIG_PWRSTAT_TELEMETRY
+    struct v3_core_pwrstat_telemetry pwrstat_telem;
+#endif
 
+#ifdef V3_CONFIG_MEM_TRACK
+    struct v3_core_mem_track memtrack_state;
+#endif
     /* struct v3_core_dev_mgr core_dev_mgr; */
 
     void * decoder_state;
@@ -138,7 +177,7 @@ struct guest_info {
     
     /* The virtual core # of this cpu (what the guest sees this core as) */
     uint32_t vcpu_id;
-     
+
 };
 
 
@@ -148,6 +187,7 @@ struct v3_vm_info {
     char name[128];
 
     v3_vm_class_t vm_class;
+    struct v3_fw_cfg_state fw_cfg_state;
 
     addr_t mem_size; /* In bytes for now */
     uint32_t mem_align;
@@ -155,11 +195,24 @@ struct v3_vm_info {
 
     struct v3_mem_hooks mem_hooks;
 
+    // arch-indepentent state of shadow pager
     struct v3_shdw_impl_state shdw_impl;
+    // arch-independent state of passthrough pager (currently none)
+    struct v3_passthrough_impl_state passthrough_impl;
+    // arch-independent state of the nested pager
+    struct v3_nested_impl_state nested_impl;
+#ifdef V3_CONFIG_SWAPPING
+    // swapping state, if enabled
+    struct v3_swap_impl_state swap_state;
+#endif
+
+    void * sched_priv_data;
 
     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;
 
@@ -182,6 +235,8 @@ struct v3_vm_info {
 
     struct v3_extensions extensions;
 
+    struct v3_perf_options perf_options;
+
 #ifdef V3_CONFIG_SYMBIOTIC
     /* Symbiotic state */
     struct v3_sym_vm_state sym_vm_state;
@@ -192,6 +247,9 @@ struct v3_vm_info {
     struct v3_telemetry_state telemetry;
 #endif
 
+#ifdef V3_CONFIG_MEM_TRACK
+    struct v3_vm_mem_track memtrack_state;
+#endif
 
     uint64_t yield_cycle_period;  
 
@@ -200,6 +258,8 @@ struct v3_vm_info {
 
     int num_cores;
 
+    int avail_cores; // Available logical cores
+
     // JRL: This MUST be the last entry...
     struct guest_info cores[0];
 };