X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=638c752d11220ae5d5d5be24b75fd4875fab41f9;hb=5b1f618cf74dbcd7e490fa3fe4da5a4c53d79b5d;hp=286592d900c3dd3f48bc81a21a354cdc6774512c;hpb=e531d13b53ac8b32bca19131dd7a2824cb17eff9;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 286592d..638c752 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -56,6 +56,8 @@ struct v3_intr_state;
 
 /* per-core state */
 struct guest_info {
+    char exec_name[256];
+    
     uint64_t rip;
 
     uint_t cpl;
@@ -65,17 +67,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;
@@ -94,19 +107,23 @@ 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 on which this core runs
+    v3_core_operating_mode_t core_run_state;
+
+    /* the logical cpu on which this core runs */
     uint32_t cpu_id;
 };
 
@@ -114,9 +131,12 @@ struct guest_info {
 
 /* shared state across cores */
 struct v3_vm_info {
+    char name[128];
+
     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
@@ -133,7 +153,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;
@@ -143,7 +164,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
 
@@ -156,14 +177,21 @@ struct v3_vm_info {
 
     uint64_t yield_cycle_period;  
 
+
+    void * host_priv_data;
+
     int num_cores;
-    struct guest_info cores[0];
 
+    // JRL: This MUST be the last entry...
+    struct guest_info cores[0];
 };
 
 int v3_init_vm(struct v3_vm_info * vm);
 int v3_init_core(struct guest_info * core);
 
+int v3_free_vm_internal(struct v3_vm_info * vm);
+int v3_free_core(struct guest_info * core);
+
 
 uint_t v3_get_addr_width(struct guest_info * info);
 v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info);
@@ -184,6 +212,6 @@ void v3_print_GPRs(struct guest_info * info);
 
 void v3_print_stack(struct guest_info * info);
 
-#endif // ! __V3VEE__
+#endif /* ! __V3VEE__ */
 
 #endif