Merge branch 'devel' of ssh://bridges@newskysaw.cs.northwestern.edu/home/palacios...

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

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 9ed1e20..af388e3 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -24,6 +24,7 @@
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_mem.h>
+#include <palacios/vmm_mem_hook.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_shadow_paging.h>
 #include <palacios/vmm_intr.h>
@@ -41,11 +42,6 @@
 #endif
 
 
-#ifdef CONFIG_VNET
-#include <palacios/vmm_vnet.h>
-#endif
-
-
 #ifdef CONFIG_SYMBIOTIC
 #include <palacios/vmm_symbiotic.h>
 struct v3_sym_core_state;
@@ -53,14 +49,12 @@ struct v3_sym_core_state;
 
 #include <palacios/vmm_config.h>
 
-
 struct v3_intr_state;
 
 
 
 
-
-
+/* per-core state */
 struct guest_info {
     uint64_t rip;
 
@@ -114,21 +108,18 @@ struct guest_info {
     struct v3_vm_info * vm_info;
     // the logical cpu this guest context is executing on
     int cpu_id;
-
-#ifdef CONFIG_VNET_PROFILE
-    struct v3_vnet_profile vnet_times;
-#endif
 };
 
 
 
-
+/* shared state across cores */
 struct v3_vm_info {
     v3_vm_class_t vm_class;
 
     addr_t mem_size; // In bytes for now
     struct v3_mem_map mem_map;
 
+    struct v3_mem_hooks mem_hooks;
 
     struct v3_shdw_impl_state shdw_impl;