#include <palacios/vmm_xml.h>
#include <palacios/vmm_io.h>
#include <palacios/vmm_msr.h>
+#include <palacios/vmm_mptable.h>
-#ifdef CONFIG_SYMBIOTIC
-#include <palacios/vmm_sym_iface.h>
-
-#ifdef CONFIG_SYMBIOTIC_SWAP
-#include <palacios/vmm_sym_swap.h>
-#endif
-
-#endif
-#ifdef CONFIG_SVM
-#include <palacios/svm.h>
-#include <palacios/svm_io.h>
-#include <palacios/svm_msr.h>
-#endif
-
-#ifdef CONFIG_VMX
-#include <palacios/vmx.h>
-#include <palacios/vmx_io.h>
-#include <palacios/vmx_msr.h>
-#endif
#include <palacios/vmm_host_events.h>
}
static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
- v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id());
+
char * memory_str = v3_cfg_val(vm_cfg, "memory");
char * schedule_hz_str = v3_cfg_val(vm_cfg, "schedule_hz");
return -1;
}
+
#ifdef CONFIG_TELEMETRY
{
char * telemetry = v3_cfg_val(vm_cfg, "telemetry");
}
#endif
- v3_init_hypercall_map(vm);
- v3_init_io_map(vm);
- v3_init_msr_map(vm);
- v3_init_cpuid_map(vm);
- v3_init_host_events(vm);
- v3_init_intr_routers(vm);
-
- // Initialize the memory map
- if (v3_init_mem_map(vm) == -1) {
- PrintError("Could not initialize shadow map\n");
+ if (v3_init_vm(vm) == -1) {
+ PrintError("Failed to initialize VM\n");
return -1;
}
-#ifdef CONFIG_SYMBIOTIC
- v3_init_sym_iface(vm);
-#endif
-
- v3_init_dev_mgr(vm);
-#ifdef CONFIG_SYMBIOTIC_SWAP
- PrintDebug("initializing symbiotic swap\n");
- v3_init_sym_swap(vm);
-#endif
-
-
- // init SVM/VMX
-#ifdef CONFIG_SVM
- if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) {
- v3_init_svm_io_map(vm);
- v3_init_svm_msr_map(vm);
- }
-#endif
-#ifdef CONFIG_VMX
- else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
- v3_init_vmx_io_map(vm);
- v3_init_vmx_msr_map(vm);
- }
-#endif
- else {
- PrintError("Invalid CPU Type\n");
- return -1;
- }
-
if (schedule_hz_str) {
sched_hz = atoi(schedule_hz_str);
}
return 0;
}
-static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
+static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_cfg)
+{
extern v3_cpu_arch_t v3_cpu_types[];
- char * paging = v3_cfg_val(core_cfg, "paging");
-
- /*
- * Initialize the subsystem data strutures
- */
-#ifdef CONFIG_TELEMETRY
- if (info->vm_info->enable_telemetry) {
- v3_init_telemetry(info);
- }
-#endif
+ v3_cfg_tree_t *vm_tree = info->vm_info->cfg_data->cfg;
+ v3_cfg_tree_t *pg_tree = v3_cfg_subtree(vm_tree, "paging");
+ char *pg_type = v3_cfg_val(vm_tree, "paging");
+ char *pg_mode = v3_cfg_val(pg_tree, "mode");
- if ((v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) &&
- (paging) && (strcasecmp(paging, "nested") == 0)) {
- PrintDebug("Guest Page Mode: NESTED_PAGING\n");
- info->shdw_pg_mode = NESTED_PAGING;
+ PrintDebug("Paging mode specified as %s(%s)\n", pg_type, pg_mode);
+
+ if (pg_type) {
+ if ((strcasecmp(pg_type, "nested") == 0)) {
+ if (v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) {
+ info->shdw_pg_mode = NESTED_PAGING;
+ } else {
+ PrintError("Nested paging not supported on this hardware. Defaulting to shadow paging\n");
+ info->shdw_pg_mode = SHADOW_PAGING;
+ }
+ } else if ((strcasecmp(pg_type, "shadow") == 0)) {
+ info->shdw_pg_mode = SHADOW_PAGING;
+ } else {
+ PrintError("Invalid paging type (%s) specified in configuration. Defaulting to shadow paging\n", pg_type);
+ info->shdw_pg_mode = SHADOW_PAGING;
+ }
} else {
- PrintDebug("Guest Page Mode: SHADOW_PAGING\n");
- v3_init_shadow_page_state(info);
+ PrintDebug("No paging type specified in configuration.\n");
info->shdw_pg_mode = SHADOW_PAGING;
}
+ if (info->shdw_pg_mode == NESTED_PAGING) {
+ PrintDebug("Guest Page Mode: NESTED_PAGING\n");
+ } else if (info->shdw_pg_mode == SHADOW_PAGING) {
+ PrintDebug("Guest Page Mode: SHADOW_PAGING\n");
+ } else {
+ PrintError("Guest paging mode incorrectly set.\n");
+ return -1;
+ }
+ return 0;
+}
+static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
- v3_init_time(info);
- v3_init_intr_controllers(info);
- v3_init_exception_state(info);
-
- v3_init_decoder(info);
-
+ if (determine_paging_mode(info, core_cfg))
+ return -1;
+ v3_init_core(info);
if (info->vm_info->vm_class == V3_PC_VM) {
if (pre_config_pc_core(info, core_cfg) == -1) {
return -1;
}
+ if (v3_inject_mptable(vm)==-1) {
+ PrintError("Failed to inject mptable during configuration\n");
+ return -1;
+ }
+
return 0;
}
for (i = 0; i < vm->num_cores; i++) {
struct guest_info * info = &(vm->cores[i]);
-
info->cpu_id = i;
info->vm_info = vm;
- pre_config_core(info, per_core_cfg);
-
- // init SVM/VMX
-#ifdef CONFIG_SVM
- if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) {
- if (v3_init_svm_vmcb(info, vm->vm_class) == -1) {
- PrintError("Error in SVM initialization\n");
- return NULL;
- }
- }
-#endif
-#ifdef CONFIG_VMX
- else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
- if (v3_init_vmx_vmcs(info, vm->vm_class) == -1) {
- PrintError("Error in VMX initialization\n");
- return NULL;
- }
- }
-#endif
- else {
- PrintError("Invalid CPU Type\n");
+ if (pre_config_core(info, per_core_cfg) == -1) {
+ PrintError("Error in core %d preconfiguration\n", i);
return NULL;
}
-
+
per_core_cfg = v3_cfg_next_branch(per_core_cfg);
}
addr_t host_addr = atox(v3_cfg_val(mem_region, "host_addr"));
- if (v3_add_shadow_mem(vm, start_addr, end_addr, host_addr) == -1) {
+ if (v3_add_shadow_mem(vm, V3_MEM_CORE_ANY, start_addr, end_addr, host_addr) == -1) {
PrintError("Could not map memory region: %p-%p => %p\n",
(void *)start_addr, (void *)end_addr, (void *)host_addr);
return -1;
