X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=5272b0d6d26c9366aebcdfd1ca3f723be431a4e7;hb=e8e3ec0355b791d6f729df796d0155bccca85090;hp=9e6ea21cc640b7868919bac357c40b390f890f59;hpb=e8069ad305c7b50fefb0cc602d9ca53324e6cc9e;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 9e6ea21..5272b0d 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -41,11 +41,22 @@
 #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_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>
@@ -71,6 +82,7 @@ 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;
     struct v3_shdw_pg_state shdw_pg_state;
@@ -115,6 +127,13 @@ 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
 
     /* struct v3_core_dev_mgr core_dev_mgr; */
 
@@ -139,7 +158,7 @@ struct guest_info {
     
     /* The virtual core # of this cpu (what the guest sees this core as) */
     uint32_t vcpu_id;
-     
+
 };
 
 
@@ -149,6 +168,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;
@@ -157,6 +177,7 @@ struct v3_vm_info {
     struct v3_mem_hooks mem_hooks;
 
     struct v3_shdw_impl_state shdw_impl;
+    void * sched_priv_data;
 
     struct v3_io_map io_map;
     struct v3_msr_map msr_map;
@@ -185,6 +206,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;
@@ -203,6 +226,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];
 };