X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=9fc40df832e172cf9b4bfde32569ba575091cf3c;hb=921772c23185aa48406a390c58546ee463f49dc4;hp=f918da681e85844b85a80fd3919063447d3d8d28;hpb=262c92c9f620f87500f350b4744d2f31b6de7da5;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index f918da6..9fc40df 100644
--- 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;
 
@@ -70,18 +65,28 @@ struct guest_info {
     v3_paging_mode_t shdw_pg_mode;
     struct v3_shdw_pg_state shdw_pg_state;
     addr_t direct_map_pt;
+    
+
+    union {
+	uint32_t flags;
+	struct {
+	    uint8_t use_large_pages        : 1;    /* Enable virtual page tables to use large pages */
+	    uint8_t use_giant_pages        : 1;    /* Enable virtual page tables to use giant (1GB) pages */
+	    uint32_t rsvd                  : 30;
+	} __attribute__((packed));
+    } __attribute__((packed));
 
 
-    // This structure is how we get interrupts for the guest
+    /* This structure is how we get interrupts for the guest */
     struct v3_intr_core_state intr_core_state;
 
-    // This structure is how we get exceptions for the guest
+    /* This structure is how we get exceptions for the guest */
     struct v3_excp_state excp_state;
 
 
     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;
@@ -100,30 +105,39 @@ struct guest_info {
 #endif
 
 
-    // struct v3_core_dev_mgr core_dev_mgr;
+    /* struct v3_core_dev_mgr core_dev_mgr; */
 
     void * decoder_state;
 
 #ifdef CONFIG_SYMBIOTIC
-    // Symbiotic state
+    /* Symbiotic state */
     struct v3_sym_core_state sym_core_state;
 #endif
 
+    /* Per-core config tree data. */
+    v3_cfg_tree_t * core_cfg_data;
 
     struct v3_vm_info * vm_info;
-    // the logical cpu this guest context is executing on
-    int cpu_id;
-};
 
+    v3_core_operating_mode_t core_run_state;
+
+    /* 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
+    addr_t mem_size; /* In bytes for now */
+    uint32_t mem_align;
     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;
 
@@ -135,7 +149,8 @@ struct v3_vm_info {
 
 
     struct v3_intr_routers intr_routers;
-    // device_map
+
+    /* device_map */
     struct vmm_dev_mgr  dev_mgr;
 
     struct v3_host_events host_event_hooks;
@@ -145,7 +160,7 @@ struct v3_vm_info {
     v3_vm_operating_mode_t run_state;
 
 #ifdef CONFIG_SYMBIOTIC
-    // Symbiotic state
+    /* Symbiotic state */
     struct v3_sym_vm_state sym_vm_state;
 #endif
 
@@ -161,6 +176,9 @@ struct v3_vm_info {
     int num_cores;
     struct guest_info cores[0];
 
+
+    void * host_priv_data;
+
 };
 
 int v3_init_vm(struct v3_vm_info * vm);
@@ -186,6 +204,6 @@ void v3_print_GPRs(struct guest_info * info);
 
 void v3_print_stack(struct guest_info * info);
 
-#endif // ! __V3VEE__
+#endif /* ! __V3VEE__ */
 
 #endif