VMX is working for a 32-bit Linux kernel. It should also work for a 64-bit kernel...

[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 eb85d7d..241ec8a 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -32,10 +32,17 @@
 #include <palacios/vmm_time.h>
 #include <palacios/vmm_host_events.h>
 #include <palacios/vmm_msr.h>
-#include <palacios/vmm_profiler.h>
 #include <palacios/vmm_hypercall.h>
 
 
+#ifdef CONFIG_TELEMETRY
+#include <palacios/vmm_telemetry.h>
+#endif
+
+#ifdef CONFIG_SYMBIOTIC_SWAP
+#include <palacios/vmm_sym_swap.h>
+#endif
+
 
 struct v3_gprs {
     v3_reg_t rdi;
@@ -110,9 +117,14 @@ struct v3_segments {
 
 struct shadow_page_state;
 struct v3_intr_state;
-struct v3_profiler;
 
+#ifdef CONFIG_TELEMETRY
+struct v3_telemetry;
+#endif
 
+#ifdef CONFIG_SYMBIOTIC_SWAP
+struct v3_sym_swap_state;
+#endif
 
 
 struct guest_info {
@@ -166,10 +178,17 @@ struct guest_info {
     uint64_t yield_cycle_period;
     uint64_t yield_start_cycle;
     
+    uint64_t num_exits;
+
+#ifdef CONFIG_TELEMETRY
+    uint_t enable_telemetry;
+    struct v3_telemetry_state telemetry;
+#endif
 
 
-    uint_t enable_profiler;
-    struct v3_profiler profiler;
+#ifdef CONFIG_SYMBIOTIC_SWAP
+    struct v3_sym_swap_state swap_state;
+#endif
 
     void * decoder_state;
 };
@@ -192,6 +211,4 @@ void v3_print_GPRs(struct guest_info * info);
 
 #endif // ! __V3VEE__
 
-
-
 #endif