added cpuid hooking

[palacios.git] / palacios / include / palacios / vm_guest.h

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 831d146..86a1cc4 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -33,10 +33,11 @@
 #include <palacios/vmm_host_events.h>
 #include <palacios/vmm_msr.h>
 #include <palacios/vmm_hypercall.h>
+#include <palacios/vmm_cpuid.h>
+#include <palacios/vmm_sym_iface.h>
 
-
-#ifdef CONFIG_PROFILE_VMM
-#include <palacios/vmm_profiler.h>
+#ifdef CONFIG_TELEMETRY
+#include <palacios/vmm_telemetry.h>
 #endif
 
 #ifdef CONFIG_SYMBIOTIC_SWAP
@@ -118,8 +119,8 @@ struct v3_segments {
 struct shadow_page_state;
 struct v3_intr_state;
 
-#ifdef CONFIG_PROFILE_VMM
-struct v3_profiler;
+#ifdef CONFIG_TELEMETRY
+struct v3_telemetry;
 #endif
 
 #ifdef CONFIG_SYMBIOTIC_SWAP
@@ -154,6 +155,11 @@ struct guest_info {
 
     struct v3_msr_map msr_map;
 
+    struct v3_cpuid_map cpuid_map;
+
+    // Symbiotic state
+    struct v3_sym_state sym_state;
+
 
     v3_hypercall_map_t hcall_map;
 
@@ -178,10 +184,11 @@ struct guest_info {
     uint64_t yield_cycle_period;
     uint64_t yield_start_cycle;
     
+    uint64_t num_exits;
 
-#ifdef CONFIG_PROFILE_VMM
-    uint_t enable_profiler;
-    struct v3_profiler profiler;
+#ifdef CONFIG_TELEMETRY
+    uint_t enable_telemetry;
+    struct v3_telemetry_state telemetry;
 #endif
 
 
@@ -190,6 +197,9 @@ struct guest_info {
 #endif
 
     void * decoder_state;
+
+    // the logical cpu this guest context is executing on
+    int cpu_id;
 };