debugging tweaks and minor fixes

[palacios.git] / palacios / include / palacios / vm_guest.h

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index b5d481c..7b849d3 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -48,6 +48,8 @@
 
 
 
+
+
 struct v3_gprs {
     v3_reg_t rdi;
     v3_reg_t rsi;
@@ -103,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));
 
 
@@ -124,6 +127,8 @@ struct v3_segments {
 #include <palacios/vmm_sym_iface.h>
 #endif
 
+#include <palacios/vmm_config.h>
+
 struct shadow_page_state;
 struct v3_intr_state;
 
@@ -147,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;
 
@@ -171,6 +178,10 @@ struct guest_info {
 #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;
@@ -204,9 +215,7 @@ struct guest_info {
 #endif
 
 
-#ifdef CONFIG_SYMBIOTIC_SWAP
-    struct v3_sym_swap_state swap_state;
-#endif
+
 
     void * decoder_state;
 
@@ -228,7 +237,7 @@ int v3_translate_segment(struct guest_info * info, uint16_t selector, struct v3_
 
 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);