Merge branch 'devel' of ssh://palacios@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 f918da6..c8bc2e0 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,10 +42,6 @@
 #endif
 
 
-
-
-
-
 #ifdef CONFIG_SYMBIOTIC
 #include <palacios/vmm_symbiotic.h>
 struct v3_sym_core_state;
@@ -52,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;
 
@@ -71,7 +66,6 @@ struct guest_info {
     struct v3_shdw_pg_state shdw_pg_state;
     addr_t direct_map_pt;
 
-
     // This structure is how we get interrupts for the guest
     struct v3_intr_core_state intr_core_state;
 
@@ -81,7 +75,7 @@ struct guest_info {
 
     v3_cpu_mode_t cpu_mode;
     v3_mem_mode_t mem_mode;
-    uint_t addr_width;
+
 
     struct v3_gprs vm_regs;
     struct v3_ctrl_regs ctrl_regs;
@@ -111,19 +105,23 @@ struct guest_info {
 
 
     struct v3_vm_info * vm_info;
-    // the logical cpu this guest context is executing on
-    int cpu_id;
-};
 
+    // the logical cpu on which this core runs
+    uint32_t cpu_id;
+};
 
 
 
+/* 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;
 
+    v3_paging_size_t paging_size; // for nested paging
+
+    struct v3_mem_hooks mem_hooks;
 
     struct v3_shdw_impl_state shdw_impl;