X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=bf9d302503db9c689390cc030a560ec6405c002f;hb=7f167672713c9d8e23540340ab1111ec748a7775;hp=1f0293f6d8c277f8e970e16acf6e176a658dea5e;hpb=29e825c5f095066bbb5ebbec5a5af1419d883264;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 1f0293f..bf9d302 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,83 +122,133 @@ 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_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 vm_time time_state;
 
-  
     v3_paging_mode_t shdw_pg_mode;
     struct shadow_page_state shdw_pg_state;
     addr_t direct_map_pt;
 
 
     // This structure is how we get interrupts for the guest
-    struct v3_intr_state intr_state;
+    struct v3_intr_core_state intr_core_state;
 
     // This structure is how we get exceptions for the guest
     struct v3_excp_state excp_state;
 
-    struct v3_io_map io_map;
-
-    struct v3_msr_map msr_map;
-
-
-    v3_hypercall_map_t hcall_map;
-
-    // device_map
-    struct vmm_dev_mgr  dev_mgr;
-
-    struct v3_host_events host_event_hooks;
 
     v3_cpu_mode_t cpu_mode;
     v3_mem_mode_t mem_mode;
     uint_t addr_width;
 
-
     struct v3_gprs vm_regs;
     struct v3_ctrl_regs ctrl_regs;
     struct v3_dbg_regs dbg_regs;
     struct v3_segments segments;
 
-    v3_vm_operating_mode_t run_state;
+
     void * vmm_data;
 
+    uint64_t yield_start_cycle;
+    
+    uint64_t num_exits;
+
+#ifdef CONFIG_TELEMETRY
+    struct v3_core_telemetry core_telem;
+#endif
+
 
-    uint_t enable_profiler;
-    struct v3_profiler profiler;
+    // struct v3_core_dev_mgr core_dev_mgr;
 
     void * decoder_state;
 
-    v3_msr_t guest_efer;
+#ifdef CONFIG_SYMBIOTIC
+    // Symbiotic state
+    struct v3_sym_local_state sym_local_state;
+#endif
+
+
+    struct v3_vm_info * vm_info;
+    // the logical cpu this guest context is executing on
+    int cpu_id;
+};
+
+
+
+
+struct v3_vm_info {
+    v3_vm_class_t vm_class;
+
+    addr_t mem_size; // In bytes for now
+    struct v3_mem_map mem_map;
+
+
+    struct v3_io_map io_map;
+    struct v3_msr_map msr_map;
+    struct v3_cpuid_map cpuid_map;
+
+    v3_hypercall_map_t hcall_map;
+
+
+    struct v3_intr_routers intr_routers;
+    // device_map
+    struct vmm_dev_mgr  dev_mgr;
+
+    struct v3_host_events host_event_hooks;
+
+    struct v3_config * cfg_data;
+
+    v3_vm_operating_mode_t run_state;
+
+#ifdef CONFIG_SYMBIOTIC
+    // Symbiotic state
+    struct v3_sym_global_state sym_global_state;
+#ifdef CONFIG_SYMBIOTIC_SWAP
+    struct v3_sym_swap_state swap_state;
+#endif
+#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;
 
+#ifdef CONFIG_TELEMETRY
+    uint_t enable_telemetry;
+    struct v3_telemetry_state telemetry;
+#endif
 
-    //uint64_t fs;
-    //uint64_t gs;
+    uint64_t yield_cycle_period;  
 
+    int num_cores;
+    struct guest_info cores[0];
 
 };
 
+int v3_init_vm(struct v3_vm_info * vm);
+int v3_init_core(struct guest_info * core);
+
 
 uint_t v3_get_addr_width(struct guest_info * info);
 v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info);
@@ -194,13 +258,17 @@ 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_segments(struct guest_info * info);
+void v3_print_guest_state(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