X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=9871d3adee147f6b28649d7981b39fabe70be0d9;hb=13d8e5d4035b90bf1ab8b1da115c7d6310c76526;hp=3635f8c4c11415112f47175f4a5ac2ac639013df;hpb=f86f45f3cbbd4c85b30a2eee73ff79e2908e1495;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 3635f8c..9871d3a 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;
@@ -71,7 +73,8 @@ struct guest_info {
 	uint32_t flags;
 	struct {
 	    uint8_t use_large_pages        : 1;    /* Enable virtual page tables to use large pages */
-	    uint32_t rsvd                  : 31;
+	    uint8_t use_giant_pages        : 1;    /* Enable virtual page tables to use giant (1GB) pages */
+	    uint32_t rsvd                  : 30;
 	} __attribute__((packed));
     } __attribute__((packed));
 
@@ -113,9 +116,13 @@ struct guest_info {
     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;
 
+    v3_core_operating_mode_t core_run_state;
+
     /* the logical cpu on which this core runs */
     uint32_t cpu_id;
 };
@@ -124,12 +131,16 @@ 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 */
     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;
@@ -166,9 +177,13 @@ 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);