X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=4a9d07572a53456f557278bbc411ef05cb1f3f6a;hb=4454a172129d12e97793c9c353339b85d3335af4;hp=5792543b0337943b78d6dfe288fa21356fb40e05;hpb=840d15c3a300636e758fcfcf403ae415ffa67816;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 5792543..4a9d075 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -27,6 +27,7 @@
 #include <palacios/vmm_mem_hook.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_shadow_paging.h>
+#include <palacios/vmm_direct_paging.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_excp.h>
 #include <palacios/vmm_dev_mgr.h>
@@ -37,24 +38,32 @@
 #include <palacios/vmm_cpuid.h>
 #include <palacios/vmm_regs.h>
 #include <palacios/vmm_extensions.h>
-
-
+#include <palacios/vmm_barrier.h>
+#include <palacios/vmm_timeout.h>
+#include <palacios/vmm_exits.h>
+#include <palacios/vmm_events.h>
+#include <palacios/vmm_scheduler.h>
+#include <palacios/vmm_fw_cfg.h>
+#include <palacios/vmm_fp.h>
+#include <palacios/vmm_perftune.h>
 
 #ifdef V3_CONFIG_TELEMETRY
 #include <palacios/vmm_telemetry.h>
 #endif
 
+#ifdef V3_CONFIG_PMU_TELEMETRY
+#include <palacios/vmm_pmu_telemetry.h>
+#endif
+
+#ifdef V3_CONFIG_PWRSTAT_TELEMETRY
+#include <palacios/vmm_pwrstat_telemetry.h>
+#endif
 
 #ifdef V3_CONFIG_SYMBIOTIC
 #include <palacios/vmm_symbiotic.h>
 struct v3_sym_core_state;
 #endif
 
-#ifdef V3_CONFIG_SYSCALL_HIJACK
-#include <palacios/vmm_syscall_hijack.h>
-#include <palacios/vmm_execve_hook.h>
-#endif
-
 
 
 #include <palacios/vmm_config.h>
@@ -72,10 +81,13 @@ struct guest_info {
 
     uint_t cpl;
 
-    struct vm_time time_state;
+    struct vm_core_time time_state;
+    struct v3_core_timeouts timeouts;
+    void * sched_priv_data;
 
     v3_paging_mode_t shdw_pg_mode;
     struct v3_shdw_pg_state shdw_pg_state;
+    //struct v3_nested_pg_state nested_pg_state;
     addr_t direct_map_pt;
     
 
@@ -95,12 +107,6 @@ struct guest_info {
     /* This structure is how we get exceptions for the guest */
     struct v3_excp_state excp_state;
 
-#ifdef V3_CONFIG_SYSCALL_HIJACK
-    struct v3_syscall_hook_map sc_hook_map;
-    struct v3_execve_varchunk var_dump;
-    struct v3_exec_hooks exec_hooks;
-#endif
-
 
     v3_cpu_mode_t cpu_mode;
     v3_mem_mode_t mem_mode;
@@ -110,7 +116,9 @@ struct guest_info {
     struct v3_ctrl_regs ctrl_regs;
     struct v3_dbg_regs dbg_regs;
     struct v3_segments segments;
+    struct v3_msrs     msrs;
 
+    struct v3_fp_state fp_state;
 
     void * vmm_data;
 
@@ -122,6 +130,13 @@ struct guest_info {
     struct v3_core_telemetry core_telem;
 #endif
 
+#ifdef V3_CONFIG_PMU_TELEMETRY
+    struct v3_core_pmu_telemetry pmu_telem;
+#endif
+
+#ifdef V3_CONFIG_PWRSTAT_TELEMETRY
+    struct v3_core_pwrstat_telemetry pwrstat_telem;
+#endif
 
     /* struct v3_core_dev_mgr core_dev_mgr; */
 
@@ -139,12 +154,14 @@ struct guest_info {
 
     v3_core_operating_mode_t core_run_state;
 
+    void * core_thread; /* thread struct for virtual core */
+
     /* the logical cpu on which this core runs */
     uint32_t pcpu_id;
     
     /* The virtual core # of this cpu (what the guest sees this core as) */
     uint32_t vcpu_id;
-     
+
 };
 
 
@@ -154,6 +171,7 @@ struct v3_vm_info {
     char name[128];
 
     v3_vm_class_t vm_class;
+    struct v3_fw_cfg_state fw_cfg_state;
 
     addr_t mem_size; /* In bytes for now */
     uint32_t mem_align;
@@ -162,10 +180,14 @@ struct v3_vm_info {
     struct v3_mem_hooks mem_hooks;
 
     struct v3_shdw_impl_state shdw_impl;
+    //struct v3_nested_impl_state nested_impl;
+    void * sched_priv_data;
 
     struct v3_io_map io_map;
     struct v3_msr_map msr_map;
     struct v3_cpuid_map cpuid_map;
+    struct v3_exit_map exit_map;
+    struct v3_event_map event_map;
 
     v3_hypercall_map_t hcall_map;
 
@@ -175,17 +197,21 @@ struct v3_vm_info {
     /* device_map */
     struct vmm_dev_mgr  dev_mgr;
 
+    struct v3_time time_state;
+
     struct v3_host_events host_event_hooks;
 
     struct v3_config * cfg_data;
 
     v3_vm_operating_mode_t run_state;
 
-
+    struct v3_barrier barrier;
 
 
     struct v3_extensions extensions;
 
+    struct v3_perf_options perf_options;
+
 #ifdef V3_CONFIG_SYMBIOTIC
     /* Symbiotic state */
     struct v3_sym_vm_state sym_vm_state;
@@ -204,6 +230,8 @@ struct v3_vm_info {
 
     int num_cores;
 
+    int avail_cores; // Available logical cores
+
     // JRL: This MUST be the last entry...
     struct guest_info cores[0];
 };
@@ -223,19 +251,10 @@ v3_mem_mode_t v3_get_vm_mem_mode(struct guest_info * info);
 const uchar_t * v3_cpu_mode_to_str(v3_cpu_mode_t mode);
 const uchar_t * v3_mem_mode_to_str(v3_mem_mode_t mode);
 
-int v3_translate_segment(struct guest_info * info, uint16_t selector, struct v3_segment * seg);
-
-
-void v3_print_guest_state(struct guest_info * info);
 
-void v3_print_segments(struct v3_segments * segs);
-void v3_print_ctrl_regs(struct guest_info * info);
-void v3_print_GPRs(struct guest_info * info);
-
-void v3_print_stack(struct guest_info * info);
 
 #endif /* ! __V3VEE__ */
 
-void v3_print_guest_state_all(struct v3_vm_info * vm);
+
 
 #endif