Merge branch 'devel' into timer_control

[palacios.git] / palacios / src / palacios / vmm_config.c

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index bc5aa23..ebad8b7 100644 (file)
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -72,9 +72,16 @@ char * v3_cfg_val(v3_cfg_tree_t * tree, char * tag) {
        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) {
@@ -189,9 +196,9 @@ static inline uint32_t get_alignment(char * align_str) {
     uint32_t alignment = PAGE_SIZE_4KB;
 
     if (align_str != NULL) {
-       if (strncasecmp(align_str, "2MB", strlen("2MB")) == 0) {
+       if (strcasecmp(align_str, "2MB") == 0) {
            alignment = PAGE_SIZE_2MB;
-       } else if (strncasecmp(align_str, "4MB", strlen("4MB")) == 0) {
+       } else if (strcasecmp(align_str, "4MB") == 0) {
            alignment = PAGE_SIZE_4MB;
        }
     }
@@ -209,9 +216,9 @@ 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");
-    v3_cfg_tree_t * pg_cfg = v3_cfg_subtree(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) {
@@ -220,10 +227,17 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     }
     
     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 = atoi(memory_str) * 1024 * 1024;
-    vm->mem_align = get_alignment(v3_cfg_val(pg_cfg, "alignment"));
+    vm->mem_align = get_alignment(align_str);
+
+    PrintDebug("Alignment computed as 0x%x\n", vm->mem_align);
 
     if (strcasecmp(vm_class, "PC") == 0) {
        vm->vm_class = V3_PC_VM;
@@ -232,7 +246,6 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
        return -1;
     }
 
-
 #ifdef CONFIG_TELEMETRY
     {
        char * telemetry = v3_cfg_val(vm_cfg, "telemetry");
@@ -271,7 +284,8 @@ static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_c
 
     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 *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);
 
@@ -290,18 +304,35 @@ static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_c
            info->shdw_pg_mode = SHADOW_PAGING;
        }
     } else {
-       PrintDebug("No paging mode specified in configuration.\n");
+       PrintDebug("No paging type specified in configuration. 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 */
+           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;
+           PrintDebug("Use of large pages in memory virtualization enabled.\n");
+       }
+    }
     return 0;
 }
 
@@ -359,11 +390,12 @@ static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
        return -1;
     }
 
-    if (v3_inject_mptable(vm)==-1) { 
+    if (v3_inject_mptable(vm) == -1) { 
        PrintError("Failed to inject mptable during configuration\n");
        return -1;
     }
 
+
     return 0;
 }
 
@@ -465,6 +497,7 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) {
 
        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);
@@ -532,12 +565,12 @@ 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;
        }