X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=de882d093c7d5566f2a329f31c69ab49bed1d888;hb=ee8feefed3a69f8145b896ac527c4d227516c411;hp=d97beac7513cd8c87d10a4c546150c4bb50ef141;hpb=95c3bb063747b4d70a24464d3d67e9c16799d9f9;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index d97beac..de882d0 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -30,7 +30,6 @@ #include #include #include -#include #include @@ -38,7 +37,6 @@ #include -#include #include "vmm_config_class.h" @@ -58,6 +56,7 @@ struct file_idx_table { static int setup_memory_map(struct v3_vm_info * vm, v3_cfg_tree_t * cfg); +static int setup_extensions(struct v3_vm_info * vm, v3_cfg_tree_t * cfg); static int setup_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg); @@ -202,7 +201,7 @@ static inline uint32_t get_alignment(char * align_str) { } } -#ifndef CONFIG_ALIGNED_PG_ALLOC +#ifndef V3_CONFIG_ALIGNED_PG_ALLOC if (alignment != PAGE_SIZE_4KB) { PrintError("Aligned page allocations are not supported in this host (requested alignment=%d)\n", alignment); PrintError("Ignoring alignment request\n"); @@ -247,7 +246,7 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { return -1; } -#ifdef CONFIG_TELEMETRY +#ifdef V3_CONFIG_TELEMETRY { char * telemetry = v3_cfg_val(vm_cfg, "telemetry"); @@ -281,19 +280,20 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { static int determine_paging_mode(struct guest_info * info, v3_cfg_tree_t * core_cfg) { - extern v3_cpu_arch_t v3_cpu_types[]; + extern v3_cpu_arch_t v3_mach_type; 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_mode = v3_cfg_val(pg_tree, "mode"); - char * page_size = v3_cfg_val(pg_tree, "page_size"); PrintDebug("Paging mode specified as %s\n", pg_mode); if (pg_mode) { if ((strcasecmp(pg_mode, "nested") == 0)) { // we assume symmetric cores, so if core 0 has nested paging they all do - if (v3_cpu_types[0] == V3_SVM_REV3_CPU) { + if ((v3_mach_type == V3_SVM_REV3_CPU) || + (v3_mach_type == V3_VMX_EPT_CPU) || + (v3_mach_type == V3_VMX_EPT_UG_CPU)) { info->shdw_pg_mode = NESTED_PAGING; } else { PrintError("Nested paging not supported on this hardware. Defaulting to shadow paging\n"); @@ -311,24 +311,6 @@ static int determine_paging_mode(struct guest_info * info, v3_cfg_tree_t * core_ } - if (info->shdw_pg_mode == NESTED_PAGING) { - PrintDebug("Guest Paging Mode: NESTED_PAGING\n"); - if (strcasecmp(page_size, "4kb") == 0) { /* TODO: this may not be an ideal place for this */ - info->vm_info->paging_size = PAGING_4KB; - } else if (strcasecmp(page_size, "2mb") == 0) { - info->vm_info->paging_size = PAGING_2MB; - } else { - PrintError("Invalid VM paging size: '%s'\n", page_size); - return -1; - } - PrintDebug("VM page size=%s\n", page_size); - } else if (info->shdw_pg_mode == SHADOW_PAGING) { - PrintDebug("Guest Paging Mode: SHADOW_PAGING\n"); - } else { - PrintError("Guest paging mode incorrectly set.\n"); - return -1; - } - if (v3_cfg_val(pg_tree, "large_pages") != NULL) { if (strcasecmp(v3_cfg_val(pg_tree, "large_pages"), "true") == 0) { info->use_large_pages = 1; @@ -369,9 +351,22 @@ static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { PrintError("Setting up guest memory map failed...\n"); return -1; } - - //v3_hook_io_port(info, 1234, &IO_Read, NULL, info); - + + + if (vm->vm_class == V3_PC_VM) { + if (post_config_pc(vm, cfg) == -1) { + PrintError("PC Post configuration failure\n"); + return -1; + } + } else { + PrintError("Invalid VM Class\n"); + return -1; + } + + + /* + * Initialize configured devices + */ if (setup_devices(vm, cfg) == -1) { PrintError("Failed to setup devices\n"); return -1; @@ -382,16 +377,17 @@ static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { v3_print_msr_map(vm); - if (vm->vm_class == V3_PC_VM) { - if (post_config_pc(vm, cfg) == -1) { - PrintError("PC Post configuration failure\n"); - return -1; - } - } else { - PrintError("Invalid VM Class\n"); + + + /* + * Initialize configured extensions + */ + if (setup_extensions(vm, cfg) == -1) { + PrintError("Failed to setup extensions\n"); return -1; } + return 0; } @@ -401,6 +397,11 @@ static int post_config_core(struct guest_info * info, v3_cfg_tree_t * cfg) { info->core_run_state = CORE_STOPPED; + if (v3_init_core_extensions(info) == -1) { + PrintError("Error intializing extension core states\n"); + return -1; + } + if (info->vm_info->vm_class == V3_PC_VM) { if (post_config_pc_core(info, cfg) == -1) { PrintError("PC Post configuration failure\n"); @@ -431,7 +432,7 @@ static struct v3_vm_info * allocate_guest(int num_cores) { struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) { - v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); + extern v3_cpu_arch_t v3_mach_type; struct v3_config * cfg_data = NULL; struct v3_vm_info * vm = NULL; int num_cores = 0; @@ -439,7 +440,7 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) { v3_cfg_tree_t * cores_cfg = NULL; v3_cfg_tree_t * per_core_cfg = NULL; - if (cpu_type == V3_INVALID_CPU) { + if (v3_mach_type == V3_INVALID_CPU) { PrintError("Configuring guest on invalid CPU\n"); return NULL; } @@ -491,7 +492,7 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) { for (i = 0; i < vm->num_cores; i++) { struct guest_info * info = &(vm->cores[i]); - info->cpu_id = i; + info->vcpu_id = i; info->vm_info = vm; info->core_cfg_data = per_core_cfg; @@ -543,6 +544,7 @@ int v3_free_config(struct v3_vm_info * vm) { + static int setup_memory_map(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { v3_cfg_tree_t * mem_region = v3_cfg_subtree(v3_cfg_subtree(cfg, "memmap"), "region"); @@ -565,6 +567,24 @@ static int setup_memory_map(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { } +static int setup_extensions(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { + v3_cfg_tree_t * extension = v3_cfg_subtree(v3_cfg_subtree(cfg, "extensions"), "extension"); + + while (extension) { + char * ext_name = v3_cfg_val(extension, "name"); + + V3_Print("Configuring extension %s\n", ext_name); + + if (v3_add_extension(vm, ext_name, extension) == -1) { + PrintError("Error adding extension %s\n", ext_name); + return -1; + } + + extension = v3_cfg_next_branch(extension); + } + + return 0; +} static int setup_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { @@ -591,4 +611,3 @@ static int setup_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { -