#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>
#include <palacios/vmm_hypercall.h>
#include <palacios/vmm_cpuid.h>
#include <palacios/vmm_regs.h>
-
-#ifdef CONFIG_TELEMETRY
+#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>
+#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 CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
#include <palacios/vmm_symbiotic.h>
struct v3_sym_core_state;
#endif
+#ifdef V3_CONFIG_MEM_TRACK
+#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
+
+
+
#include <palacios/vmm_config.h>
struct v3_intr_state;
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;
+ // arch-independent state of shadow pager
struct v3_shdw_pg_state shdw_pg_state;
+ // arch-indepedent state of the passthrough pager
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 {
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;
+ // the arch-dependent state (SVM or VMX)
void * vmm_data;
uint64_t yield_start_cycle;
uint64_t num_exits;
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
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
+
+#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;
-#ifdef CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
/* Symbiotic state */
struct v3_sym_core_state sym_core_state;
#endif
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 cpu_id;
-
+ uint32_t pcpu_id;
+
+ /* The virtual core # of this cpu (what the guest sees this core as) */
+ uint32_t vcpu_id;
+
};
char name[128];
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;
- v3_paging_size_t paging_size; // for nested paging
-
struct v3_mem_hooks mem_hooks;
+ // arch-indepentent state of shadow pager
struct v3_shdw_impl_state shdw_impl;
+ // arch-independent state of passthrough pager (currently none)
+ 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;
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;
/* 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;
-#ifdef CONFIG_SYMBIOTIC
+ 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;
#endif
-
-
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
uint_t enable_telemetry;
struct v3_telemetry_state telemetry;
#endif
+#ifdef V3_CONFIG_MEM_TRACK
+ 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;
+
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
+
// JRL: This MUST be the last entry...
struct guest_info cores[0];
};
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
