Added alignment of memory as a top-level VM parameter to ease use of 2MB

[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 f6bd9cb..3635f8c 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -54,7 +54,7 @@ struct v3_intr_state;
 
 
 
-
+/* per-core state */
 struct guest_info {
     uint64_t rip;
 
@@ -65,18 +65,27 @@ 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 */
+           uint32_t rsvd                  : 31;
+       } __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;
@@ -95,28 +104,30 @@ 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
 
 
     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
+    addr_t mem_size; /* In bytes for now */
+    uint32_t mem_align;
     struct v3_mem_map mem_map;
 
     struct v3_mem_hooks mem_hooks;
@@ -131,7 +142,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;
@@ -141,7 +153,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
 
@@ -182,6 +194,6 @@ void v3_print_GPRs(struct guest_info * info);
 
 void v3_print_stack(struct guest_info * info);
 
-#endif // ! __V3VEE__
+#endif /* ! __V3VEE__ */
 
 #endif