X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=d9ccd54fd21fc03d4f39e93794d3d0473acf3f20;hb=4071a0ced0f209760c73e505c1634512abf29728;hp=ecabff7df10bdd462c02046a57bfe590e5cd00d4;hpb=85e86b3089abbc75a0834c361d082861fabb6335;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index ecabff7..d9ccd54 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -71,7 +71,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 +114,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;
 };
@@ -127,8 +132,11 @@ struct v3_vm_info {
     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;
@@ -165,9 +173,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);