X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=86eb1dd14c2792ef0fc98ba878f8ec3d70ac6c2b;hb=33b6aeb3258d1506b8e96e45e9b002554b664ca8;hp=11814a6af76e2bc293d9d10a520e49cf2cc7e421;hpb=d67c78032a64cc297e791caf2f678bc20aa13a3b;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 11814a6..86eb1dd 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -199,7 +199,7 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     PrintDebug("Memory=%s\n", memory_str);
 
     // Amount of ram the Guest will have, always in MB
-    vm->mem_size = atoi(memory_str) * 1024 * 1024;
+    vm->mem_size = (unsigned long)atoi(memory_str) * 1024UL * 1024UL;
     
     if (strcasecmp(vm_class, "PC") == 0) {
 	vm->vm_class = V3_PC_VM;
@@ -208,7 +208,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");
@@ -247,34 +246,43 @@ 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_type = v3_cfg_val(pg_tree, "type");
-    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(%s)\n", pg_type, pg_mode);
+    PrintDebug("Paging mode specified as %s\n", pg_mode);
 
-    if (pg_type) {
-	if ((strcasecmp(pg_type, "nested") == 0)) {
+    if (pg_mode) {
+	if ((strcasecmp(pg_mode, "nested") == 0)) {
 	    if (v3_cpu_types[info->cpu_id] == 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;
 	    }
-	} else if ((strcasecmp(pg_type, "shadow") == 0)) {
+	} else if ((strcasecmp(pg_mode, "shadow") == 0)) {
 	    info->shdw_pg_mode = SHADOW_PAGING;
 	} else {
-	    PrintError("Invalid paging type (%s) specified in configuration. Defaulting to shadow paging\n", pg_type);
+	    PrintError("Invalid paging mode (%s) specified in configuration. Defaulting to shadow paging\n", pg_mode);
 	    info->shdw_pg_mode = SHADOW_PAGING;
 	}
     } else {
-	PrintDebug("No paging type 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 Page Mode: NESTED_PAGING\n");
+    	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 Page Mode: SHADOW_PAGING\n");
+        PrintDebug("Guest Paging Mode: SHADOW_PAGING\n");
     } else {
 	PrintError("Guest paging mode incorrectly set.\n");
 	return -1;