New Shadow paging implementation to allow pluggable shadow paging implementations

[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 18b5004..37ae5b8 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -150,7 +150,7 @@ struct guest_info {
     struct vm_time time_state;
 
     v3_paging_mode_t shdw_pg_mode;
-    struct shadow_page_state shdw_pg_state;
+    struct v3_shdw_pg_state shdw_pg_state;
     addr_t direct_map_pt;
 
 
@@ -186,6 +186,11 @@ struct guest_info {
 
     void * decoder_state;
 
+#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
@@ -202,6 +207,8 @@ struct v3_vm_info {
     struct v3_mem_map mem_map;
 
 
+    struct v3_shdw_impl_state shdw_impl;
+
     struct v3_io_map io_map;
     struct v3_msr_map msr_map;
     struct v3_cpuid_map cpuid_map;
@@ -221,7 +228,7 @@ struct v3_vm_info {
 
 #ifdef CONFIG_SYMBIOTIC
     // Symbiotic state
-    struct v3_sym_state sym_state;
+    struct v3_sym_global_state sym_global_state;
 #ifdef CONFIG_SYMBIOTIC_SWAP
     struct v3_sym_swap_state swap_state;
 #endif