X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=26943c8441f493c824490f1bb98ffe4004077537;hb=0adb91252edd4b093f12f57eea76687ced1aec0c;hp=22ab61187fdd42ea3bad43446d115eee43470b85;hpb=0aed29b0f8c93d2bef57d589e8bf058445e89fc2;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 22ab611..26943c8 100644
--- 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) {
@@ -239,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");
@@ -278,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);
 
@@ -297,18 +304,34 @@ 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 (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;
 }
 
@@ -366,11 +389,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;
 }
 
@@ -472,6 +496,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);
@@ -539,12 +564,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;
 	}