X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=7b849d3cbf0f87f14932a24ab235e8cc9538e2f4;hp=e2c2739df5a83b2848eda052f5d348b33cd9b718;hb=cfcc5717f659b3ed2954f41cf363d3bceae8dc84;hpb=57de08049d9a345445d26741c5ee0f7f9e5c2fcc

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index e2c2739..7b849d3 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -32,8 +32,21 @@
 #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>
+
+
+#ifdef CONFIG_TELEMETRY
+#include <palacios/vmm_telemetry.h>
+#endif
+
+#ifdef CONFIG_SYMBIOTIC_SWAP
+#include <palacios/vmm_sym_swap.h>
+#endif
+
+
+
+
 
 
 
@@ -81,9 +94,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;
@@ -92,6 +105,7 @@ struct v3_segment {
     uint_t long_mode      : 1;
     uint_t db             : 1;
     uint_t granularity    : 1;
+    uint_t unusable       : 1;
 } __attribute__((packed));
 
 
@@ -108,21 +122,38 @@ struct v3_segments {
     struct v3_segment tr;
 };
 
+
+#ifdef CONFIG_SYMBIOTIC
+#include <palacios/vmm_sym_iface.h>
+#endif
+
+#include <palacios/vmm_config.h>
+
 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
 
+#ifdef CONFIG_SYMBIOTIC
+struct v3_sym_state;
+#endif
 
 struct guest_info {
-    ullong_t rip;
+    uint64_t rip;
 
     uint_t cpl;
 
     addr_t mem_size; // In bytes for now
     v3_shdw_map_t mem_map;
 
+    struct v3_config * cfg_data;
+    v3_vm_class_t vm_class;
 
     struct vm_time time_state;
 
@@ -138,10 +169,20 @@ 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;
+
+#ifdef CONFIG_SYMBIOTIC
+    // Symbiotic state
+    struct v3_sym_state sym_state;
+
+#ifdef CONFIG_SYMBIOTIC_SWAP
+    struct v3_sym_swap_state swap_state;
+#endif
+#endif
 
     v3_hypercall_map_t hcall_map;
 
@@ -163,44 +204,45 @@ 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;
+#ifdef CONFIG_TELEMETRY
+    uint_t enable_telemetry;
+    struct v3_telemetry_state telemetry;
+#endif
 
-    /* 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;
 
 
-    //uint64_t fs;
-    //uint64_t gs;
 
+    void * decoder_state;
 
+    // the logical cpu this guest context is executing on
+    int cpu_id;
 };
 
 
 uint_t v3_get_addr_width(struct guest_info * info);
-v3_cpu_mode_t v3_get_cpu_mode(struct guest_info * info);
-v3_mem_mode_t v3_get_mem_mode(struct guest_info * info);
+v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info);
+v3_mem_mode_t v3_get_vm_mem_mode(struct guest_info * info);
 
 
 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);
 
+int v3_translate_segment(struct guest_info * info, uint16_t selector, struct v3_segment * seg);
+
+
+void v3_print_guest_state(struct guest_info * info);
 
-void v3_print_segments(struct guest_info * info);
+void v3_print_segments(struct v3_segments * segs);
 void v3_print_ctrl_regs(struct guest_info * info);
 void v3_print_GPRs(struct guest_info * info);
 
-#endif // ! __V3VEE__
-
+void v3_print_stack(struct guest_info * info);
 
+#endif // ! __V3VEE__
 
 #endif