Removed a lot of the highly specific multicore code from the general core VMM code

[palacios-OLD.git] / palacios / include / palacios / vm_guest.h

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 3635f8c..9fc40df 100644 (file)
--- 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;
 };
@@ -130,6 +135,8 @@ struct v3_vm_info {
     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;
@@ -169,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);