X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=84468b233529441ca67e87db35b4f923d64c6ae1;hb=de5c2110458436a9300aa0a171dbbe83e415ee4d;hp=a4fca43e1e38a63ee252dc29e328d638e4c374f1;hpb=ce0f119828348c3c57a00c4aa268a8a223ccd7f8;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index a4fca43..84468b2 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -39,6 +39,7 @@
 #include <palacios/vmm_regs.h>
 #include <palacios/vmm_extensions.h>
 #include <palacios/vmm_barrier.h>
+#include <palacios/vmm_subset.h>
 #include <palacios/vmm_timeout.h>
 #include <palacios/vmm_exits.h>
 #include <palacios/vmm_events.h>
@@ -69,7 +70,17 @@ struct v3_sym_core_state;
 #include <palacios/vmm_mem_track.h>
 #endif
 
+#ifdef V3_CONFIG_MULTIBOOT
+#include <palacios/vmm_multiboot.h>
+#endif
 
+#ifdef V3_CONFIG_HVM
+#include <palacios/vmm_hvm.h>
+#endif
+
+#ifdef V3_CONFIG_CACHEPART
+#include <palacios/vmm_cachepart.h>
+#endif
 
 #include <palacios/vmm_config.h>
 
@@ -90,6 +101,9 @@ struct guest_info {
     struct v3_core_timeouts timeouts;
     void * sched_priv_data;
 
+    // Resource constraints/etc for the thread running this core
+    v3_resource_control_t  resource_control;
+
     v3_paging_mode_t shdw_pg_mode;
     // arch-independent state of shadow pager
     struct v3_shdw_pg_state shdw_pg_state;
@@ -154,6 +168,12 @@ struct guest_info {
 #ifdef V3_CONFIG_MEM_TRACK
     struct v3_core_mem_track memtrack_state;
 #endif
+
+#ifdef V3_CONFIG_HVM
+    struct v3_core_hvm  hvm_state;
+#endif
+
+
     /* struct v3_core_dev_mgr core_dev_mgr; */
 
     void * decoder_state;
@@ -187,8 +207,16 @@ struct v3_vm_info {
     char name[128];
 
     v3_vm_class_t vm_class;
+
+    // Resource control for whole VM - determined early and used
+    // when building the VM, then cloned to each core
+    v3_resource_control_t resource_control;
+
     struct v3_fw_cfg_state fw_cfg_state;
 
+    // This is always the total RAM (addresses 0...mem_size)
+    // in the VM.  
+    // With an HVM, this is partitioned as per hvm_state
     addr_t mem_size; /* In bytes for now */
     uint32_t mem_align;
     struct v3_mem_map mem_map;
@@ -251,11 +279,29 @@ struct v3_vm_info {
     struct v3_vm_mem_track memtrack_state;
 #endif
 
+#ifdef V3_CONFIG_MULTIBOOT
+    struct v3_vm_multiboot  mb_state;
+#endif
+
+#ifdef V3_CONFIG_HVM
+    struct v3_vm_hvm  hvm_state;
+#endif
+
+    // used to implement reset of regular VM and ROS
+    v3_counting_barrier_t  reset_barrier;
+
+#ifdef V3_CONFIG_CACHEPART
+    v3_cachepart_t  cachepart_state;
+#endif
+
+
     uint64_t yield_cycle_period;  
 
 
     void * host_priv_data;
 
+    // This is always the total number of vcores in the VM 
+    // With an HVM, these are partitioned as per hvm_state
     int num_cores;
 
     int avail_cores; // Available logical cores