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=749925d321e7b122881545e160e8d8b43f8f1ca1;hb=cfcc5717f659b3ed2954f41cf363d3bceae8dc84;hpb=e63be432894673d56526c4f1c2cb4fa64daf01d9

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 749925d..7b849d3 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -33,7 +33,8 @@
 #include <palacios/vmm_host_events.h>
 #include <palacios/vmm_msr.h>
 #include <palacios/vmm_hypercall.h>
-#include <palacios/vmm_sym_iface.h>
+#include <palacios/vmm_cpuid.h>
+
 
 #ifdef CONFIG_TELEMETRY
 #include <palacios/vmm_telemetry.h>
@@ -44,6 +45,11 @@
 #endif
 
 
+
+
+
+
+
 struct v3_gprs {
     v3_reg_t rdi;
     v3_reg_t rsi;
@@ -99,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));
 
 
@@ -115,6 +122,13 @@ 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;
 
@@ -126,6 +140,9 @@ struct v3_telemetry;
 struct v3_sym_swap_state;
 #endif
 
+#ifdef CONFIG_SYMBIOTIC
+struct v3_sym_state;
+#endif
 
 struct guest_info {
     uint64_t rip;
@@ -135,6 +152,8 @@ struct guest_info {
     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;
 
@@ -154,9 +173,16 @@ struct guest_info {
 
     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;
 
@@ -189,9 +215,7 @@ struct guest_info {
 #endif
 
 
-#ifdef CONFIG_SYMBIOTIC_SWAP
-    struct v3_sym_swap_state swap_state;
-#endif
+
 
     void * decoder_state;
 
@@ -208,13 +232,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_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);
 
+void v3_print_stack(struct guest_info * info);
+
 #endif // ! __V3VEE__
 
 #endif