X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=f24dc3832e5cb9612ca0b45d8131d6105ef4fa6a;hb=374b2d6d22a0e0dc6ed8d3d628e635ab935072e0;hp=6ffa3e44b9ceaaa14d5e08d191d4941bedadc286;hpb=07a12ade201ee7c2fe2358084ca079d2facac500;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 6ffa3e4..f24dc38 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -31,7 +31,7 @@ #include #include #include - +#include @@ -58,6 +58,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); @@ -166,7 +167,6 @@ static struct v3_config * parse_config(void * cfg_blob) { return NULL; } - V3_Print("File index=%d id=%s\n", idx, id); strncpy(file->tag, id, 256); @@ -212,15 +212,16 @@ static inline uint32_t get_alignment(char * align_str) { return alignment; } -static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { +static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { char * memory_str = v3_cfg_val(vm_cfg, "memory"); char * schedule_hz_str = v3_cfg_val(vm_cfg, "schedule_hz"); char * vm_class = v3_cfg_val(vm_cfg, "class"); char * align_str = v3_cfg_val(v3_cfg_subtree(vm_cfg, "memory"), "alignment"); uint32_t sched_hz = 100; // set the schedule frequency to 100 HZ - + + if (!memory_str) { PrintError("Memory is a required configuration parameter\n"); return -1; @@ -237,6 +238,7 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { vm->mem_size = (addr_t)atoi(memory_str) * 1024 * 1024; vm->mem_align = get_alignment(align_str); + PrintDebug("Alignment for %lu bytes of memory computed as 0x%x\n", vm->mem_size, vm->mem_align); if (strcasecmp(vm_class, "PC") == 0) { @@ -278,8 +280,8 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { return 0; } -static int determine_paging_mode(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[]; v3_cfg_tree_t * vm_tree = info->vm_info->cfg_data->cfg; @@ -291,7 +293,8 @@ static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_c if (pg_mode) { if ((strcasecmp(pg_mode, "nested") == 0)) { - if (v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) { + // we assume symmetric cores, so if core 0 has nested paging they all do + if (v3_cpu_types[0] == V3_SVM_REV3_CPU) { info->shdw_pg_mode = NESTED_PAGING; } else { PrintError("Nested paging not supported on this hardware. Defaulting to shadow paging\n"); @@ -337,9 +340,9 @@ static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_c } static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) { - - if (determine_paging_mode(info, core_cfg)) + if (determine_paging_mode(info, core_cfg) != 0) { return -1; + } v3_init_core(info); @@ -367,9 +370,18 @@ 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); - + + /* + * Initialize configured extensions + */ + if (setup_extensions(vm, cfg) == -1) { + PrintError("Failed to setup extensions\n"); + return -1; + } + + /* + * Initialize configured devices + */ if (setup_devices(vm, cfg) == -1) { PrintError("Failed to setup devices\n"); return -1; @@ -428,7 +440,7 @@ static struct v3_vm_info * allocate_guest(int num_cores) { -struct v3_vm_info * v3_config_guest(void * cfg_blob) { +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()); struct v3_config * cfg_data = NULL; struct v3_vm_info * vm = NULL; @@ -457,7 +469,6 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { } num_cores = atoi(v3_cfg_val(cores_cfg, "count")); - if (num_cores == 0) { PrintError("No cores specified in configuration\n"); return NULL; @@ -472,6 +483,8 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { return NULL; } + vm->host_priv_data = priv_data; + vm->cfg_data = cfg_data; V3_Print("Preconfiguration\n"); @@ -481,7 +494,6 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { return NULL; } - V3_Print("Per core configuration\n"); per_core_cfg = v3_cfg_subtree(cores_cfg, "core"); @@ -498,6 +510,7 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { return NULL; } + per_core_cfg = v3_cfg_next_branch(per_core_cfg); } @@ -528,6 +541,16 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { +int v3_free_config(struct v3_vm_info * vm) { + + v3_free_htable(vm->cfg_data->file_table, 1, 0); + + v3_xml_free(vm->cfg_data->cfg); + + V3_Free(vm->cfg_data); + return 0; +} + static int setup_memory_map(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { @@ -552,6 +575,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) { @@ -578,4 +619,3 @@ static int setup_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { -