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

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index e2c2739..831d146 100644
--- 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_PROFILE_VMM
+#include <palacios/vmm_profiler.h>
+#endif
+
+#ifdef CONFIG_SYMBIOTIC_SWAP
+#include <palacios/vmm_sym_swap.h>
+#endif
+
 
 struct v3_gprs {
     v3_reg_t rdi;
@@ -81,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;
@@ -110,13 +117,18 @@ struct v3_segments {
 
 struct shadow_page_state;
 struct v3_intr_state;
-struct v3_profiler;
 
+#ifdef CONFIG_PROFILE_VMM
+struct v3_profiler;
+#endif
 
+#ifdef CONFIG_SYMBIOTIC_SWAP
+struct v3_sym_swap_state;
+#endif
 
 
 struct guest_info {
-    ullong_t rip;
+    uint64_t rip;
 
     uint_t cpl;
 
@@ -138,7 +150,7 @@ 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;
 
@@ -163,44 +175,39 @@ struct guest_info {
     v3_vm_operating_mode_t run_state;
     void * vmm_data;
 
+    uint64_t yield_cycle_period;
+    uint64_t yield_start_cycle;
+    
 
+#ifdef CONFIG_PROFILE_VMM
     uint_t enable_profiler;
     struct v3_profiler profiler;
+#endif
 
-    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;
-
-
-    //uint64_t fs;
-    //uint64_t gs;
 
+#ifdef CONFIG_SYMBIOTIC_SWAP
+    struct v3_sym_swap_state swap_state;
+#endif
 
+    void * decoder_state;
 };
 
 
 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);
 
 
+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