X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=f05b75567a73c8ef5cab362ef378e1302fe6309c;hb=381d76bf7d07e428b66672b766e93837dca67d3a;hp=9c0aa59c2ecb1898908f04c65022890d55b463c8;hpb=cb7271d5e2fede8f39ece1c4b5ba516834c1e4aa;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 9c0aa59..f05b755 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -239,7 +239,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 +277,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,13 +297,22 @@ 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 {