X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=738d2eee1e7dc13911992c40b2bc5a46d60d9442;hb=c8a303c8512c0dafcb8dd5f83e6682729165d547;hp=f05b75567a73c8ef5cab362ef378e1302fe6309c;hpb=381d76bf7d07e428b66672b766e93837dca67d3a;p=palacios-OLD.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index f05b755..738d2ee 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) { @@ -320,11 +327,12 @@ static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_c 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"); + 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; }