X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=86a1cc46b5d51858bcb4fc7d2d85700b26f21278;hp=63decc2765aae3e98c13775f3fb0d07266bf72f3;hb=c06413341bf1dca02f22c0502fa5c2d1c2c11eab;hpb=39849abeb743c4e6b669a790c307979fa8d51884

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 63decc2..86a1cc4 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -32,9 +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>
+#include <palacios/vmm_cpuid.h>
+#include <palacios/vmm_sym_iface.h>
 
+#ifdef CONFIG_TELEMETRY
+#include <palacios/vmm_telemetry.h>
+#endif
+
+#ifdef CONFIG_SYMBIOTIC_SWAP
+#include <palacios/vmm_sym_swap.h>
+#endif
 
 
 struct v3_gprs {
@@ -81,9 +89,9 @@ struct v3_dbg_regs {
 };
 
 struct v3_segment {
-    ushort_t selector;
+    uint16_t selector;
     uint_t limit;
-    ullong_t base;
+    uint64_t base;
     uint_t type           : 4;
     uint_t system         : 1;
     uint_t dpl            : 2;
@@ -110,13 +118,18 @@ 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 {
-    ullong_t rip;
+    uint64_t rip;
 
     uint_t cpl;
 
@@ -138,10 +151,15 @@ struct guest_info {
     // This structure is how we get exceptions for the guest
     struct v3_excp_state excp_state;
 
-    v3_io_map_t io_map;
+    struct v3_io_map io_map;
 
     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;
 
@@ -163,26 +181,25 @@ struct guest_info {
     v3_vm_operating_mode_t run_state;
     void * vmm_data;
 
+    uint64_t yield_cycle_period;
+    uint64_t yield_start_cycle;
+    
+    uint64_t num_exits;
 
-    uint_t enable_profiler;
-    struct v3_profiler profiler;
-
-    void * decoder_state;
-
-    v3_msr_t guest_efer;
-
-    /* Do we need these ? */
-    v3_msr_t guest_star;
-    v3_msr_t guest_lstar;
-    v3_msr_t guest_cstar;
-    v3_msr_t guest_syscall_mask;
-    v3_msr_t guest_gs_base;
+#ifdef CONFIG_TELEMETRY
+    uint_t enable_telemetry;
+    struct v3_telemetry_state telemetry;
+#endif
 
 
-    //uint64_t fs;
-    //uint64_t gs;
+#ifdef CONFIG_SYMBIOTIC_SWAP
+    struct v3_sym_swap_state swap_state;
+#endif
 
+    void * decoder_state;
 
+    // the logical cpu this guest context is executing on
+    int cpu_id;
 };
 
 
@@ -195,12 +212,12 @@ 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);
 
 
+void v3_print_guest_state(struct guest_info * info);
+
 void v3_print_segments(struct guest_info * info);
 void v3_print_ctrl_regs(struct guest_info * info);
 void v3_print_GPRs(struct guest_info * info);
 
 #endif // ! __V3VEE__
 
-
-
 #endif