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;
return -1;
}
-
#ifdef CONFIG_TELEMETRY
{
char * telemetry = v3_cfg_val(vm_cfg, "telemetry");
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;