X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=68504b4032c4b1cf413f02b9f9be9ccdf4bb15a6;hb=068d7e66db537f981fde19a098a12e4390fa3de4;hp=23329eb6abeda984f5f1582fe36dc7f4e31bd8df;hpb=5bc39eb312c57576e5d388594563df7dce5aaa2d;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 23329eb..68504b4 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -27,14 +27,22 @@
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_shadow_paging.h>
 #include <palacios/vmm_intr.h>
+#include <palacios/vmm_excp.h>
 #include <palacios/vmm_dev_mgr.h>
 #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;
@@ -80,9 +88,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;
@@ -109,13 +117,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;
 
@@ -129,13 +142,15 @@ struct guest_info {
     v3_paging_mode_t shdw_pg_mode;
     struct shadow_page_state shdw_pg_state;
     addr_t direct_map_pt;
-    // nested_paging_t nested_page_state;
 
 
     // This structure is how we get interrupts for the guest
     struct v3_intr_state intr_state;
 
-    v3_io_map_t io_map;
+    // 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;
 
@@ -147,8 +162,8 @@ struct guest_info {
 
     struct v3_host_events host_event_hooks;
 
-    v3_vm_cpu_mode_t cpu_mode;
-    v3_vm_mem_mode_t mem_mode;
+    v3_cpu_mode_t cpu_mode;
+    v3_mem_mode_t mem_mode;
     uint_t addr_width;
 
 
@@ -160,37 +175,38 @@ 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;
 };
 
 
 uint_t v3_get_addr_width(struct guest_info * info);
-v3_vm_cpu_mode_t v3_get_cpu_mode(struct guest_info * info);
-v3_vm_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);
 
-const uchar_t * v3_cpu_mode_to_str(v3_vm_cpu_mode_t mode);
-const uchar_t * v3_mem_mode_to_str(v3_vm_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);
@@ -198,6 +214,4 @@ void v3_print_GPRs(struct guest_info * info);
 
 #endif // ! __V3VEE__
 
-
-
 #endif