X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=3029c3cd60cdb98680b23b1a805c9163a1df4ffc;hb=1c5bf75232c70f01570ddc8b075f9455b7c6ba34;hp=1819fa839fe6f84131c5e92fc3abe43b97a79667;hpb=a4fd5bcc79e7cdf9a3bd879294566bff0666ced7;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 1819fa8..3029c3c 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -47,6 +47,7 @@
 #include <palacios/vmm_fp.h>
 #include <palacios/vmm_perftune.h>
 
+
 #ifdef V3_CONFIG_TELEMETRY
 #include <palacios/vmm_telemetry.h>
 #endif
@@ -64,6 +65,14 @@
 struct v3_sym_core_state;
 #endif
 
+#ifdef V3_CONFIG_MEM_TRACK
+#include <palacios/vmm_mem_track.h>
+#endif
+
+#ifdef V3_CONFIG_HVM
+#include <palacios/vmm_hvm.h>
+#endif
+
 
 
 #include <palacios/vmm_config.h>
@@ -92,6 +101,10 @@ struct guest_info {
     addr_t direct_map_pt;
     // arch-independent state of the nested pager (currently none)
     // struct v3_nested_pg_state nested_pg_state;
+    // per-core state of the swapper (currently none)
+    //#ifdef V3_CONFIG_SWAPPING
+    //   struct v3_swap_impl_state swap_impl;
+    //#endif
     
 
     union {
@@ -142,6 +155,15 @@ struct guest_info {
     struct v3_core_pwrstat_telemetry pwrstat_telem;
 #endif
 
+#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;
@@ -177,6 +199,9 @@ struct v3_vm_info {
     v3_vm_class_t vm_class;
     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;
@@ -189,6 +214,11 @@ struct v3_vm_info {
     struct v3_passthrough_impl_state passthrough_impl;
     // arch-independent state of the nested pager
     struct v3_nested_impl_state nested_impl;
+#ifdef V3_CONFIG_SWAPPING
+    // swapping state, if enabled
+    struct v3_swap_impl_state swap_state;
+#endif
+
     void * sched_priv_data;
 
     struct v3_io_map io_map;
@@ -230,12 +260,21 @@ struct v3_vm_info {
     struct v3_telemetry_state telemetry;
 #endif
 
+#ifdef V3_CONFIG_MEM_TRACK
+    struct v3_vm_mem_track memtrack_state;
+#endif
+
+#ifdef V3_CONFIG_HVM
+    struct v3_vm_hvm  hvm_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