#include <palacios/vmm_io.h>
#include <palacios/vmm_msr.h>
#include <palacios/vmm_mptable.h>
-
+#include <palacios/vmm_sprintf.h>
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);
return NULL;
}
- val = (attrib == NULL) ? v3_xml_txt(child_entry): attrib;
-
- return val;
+ if (attrib == NULL) {
+ val = v3_xml_txt(child_entry);
+
+ if ( val[0] == 0 )
+ val = NULL;
+ } else {
+ val = attrib;
+ }
+
+ return val;
}
v3_cfg_tree_t * v3_cfg_subtree(v3_cfg_tree_t * tree, char * tag) {
return NULL;
}
-
V3_Print("File index=%d id=%s\n", idx, id);
strncpy(file->tag, id, 256);
return cfg;
}
-static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
+static inline uint32_t get_alignment(char * align_str) {
+ // default is 4KB alignment
+ uint32_t alignment = PAGE_SIZE_4KB;
+
+ if (align_str != NULL) {
+ if (strcasecmp(align_str, "2MB") == 0) {
+ alignment = PAGE_SIZE_2MB;
+ } else if (strcasecmp(align_str, "4MB") == 0) {
+ alignment = PAGE_SIZE_4MB;
+ }
+ }
+
+#ifndef 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");
+ }
+#endif
+ return alignment;
+}
+
+
+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;
}
PrintDebug("Memory=%s\n", memory_str);
+ if (align_str) {
+ PrintDebug("Alignment=%s\n", align_str);
+ } else {
+ PrintDebug("Alignment defaulted to 4KB.\n");
+ }
// Amount of ram the Guest will have, always in MB
- vm->mem_size = (unsigned long)atoi(memory_str) * 1024UL * 1024UL;
-
+ 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) {
vm->vm_class = V3_PC_VM;
} else {
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;
- 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");
+ 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)) {
- 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");
info->shdw_pg_mode = SHADOW_PAGING;
}
+
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 */
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;
+ PrintDebug("Use of large pages in memory virtualization enabled.\n");
+ }
+ }
return 0;
}
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);
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;
return -1;
}
- if (v3_inject_mptable(vm)==-1) {
- PrintError("Failed to inject mptable during configuration\n");
- return -1;
- }
-
return 0;
}
static int post_config_core(struct guest_info * info, v3_cfg_tree_t * cfg) {
-
+ info->core_run_state = CORE_STOPPED;
if (info->vm_info->vm_class == V3_PC_VM) {
if (post_config_pc_core(info, cfg) == -1) {
-struct v3_vm_info * v3_config_guest(void * cfg_blob) {
- v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id());
+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;
int num_cores = 0;
}
num_cores = atoi(v3_cfg_val(cores_cfg, "count"));
-
if (num_cores == 0) {
PrintError("No cores specified in configuration\n");
return NULL;
return NULL;
}
+ vm->host_priv_data = priv_data;
+
vm->cfg_data = cfg_data;
V3_Print("Preconfiguration\n");
return NULL;
}
-
V3_Print("Per core configuration\n");
per_core_cfg = v3_cfg_subtree(cores_cfg, "core");
info->cpu_id = i;
info->vm_info = vm;
+ info->core_cfg_data = per_core_cfg;
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);
}
+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) {
}
+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) {
while (device) {
- char * id = v3_cfg_val(device, "id");
+ char * dev_class = v3_cfg_val(device, "class");
- V3_Print("configuring device %s\n", id);
+ V3_Print("configuring device %s\n", dev_class);
- if (v3_create_device(vm, id, device) == -1) {
- PrintError("Error creating device %s\n", id);
+ if (v3_create_device(vm, dev_class, device) == -1) {
+ PrintError("Error creating device %s\n", dev_class);
return -1;
}
-
