Fixed stupid branch check, added more preconfig error checking

[palacios.git] / palacios / src / palacios / vmm_config.c

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index b622295..11814a6 100644 (file)
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -30,16 +30,9 @@
 #include <palacios/vmm_xml.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_msr.h>
+#include <palacios/vmm_mptable.h>
 
 
-#ifdef CONFIG_SYMBIOTIC
-#include <palacios/vmm_sym_iface.h>
-
-#ifdef CONFIG_SYMBIOTIC_SWAP
-#include <palacios/vmm_sym_swap.h>
-#endif
-
-#endif
 
 
 
@@ -248,26 +241,53 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     return 0;
 }
 
-static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
+static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_cfg)
+{
     extern v3_cpu_arch_t v3_cpu_types[];
-    v3_cfg_tree_t * paging_cfg = v3_cfg_subtree(core_cfg, "paging");
-    char * paging = v3_cfg_val(paging_cfg, "mode");
-
 
+    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");
     
-    if ((v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) && 
-       (paging) && (strcasecmp(paging, "nested") == 0)) {
-       PrintDebug("Guest Page Mode: NESTED_PAGING\n");
-       info->shdw_pg_mode = NESTED_PAGING;
+    PrintDebug("Paging mode specified as %s(%s)\n", pg_type, pg_mode);
+
+    if (pg_type) {
+       if ((strcasecmp(pg_type, "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)) {
+           info->shdw_pg_mode = SHADOW_PAGING;
+       } else {
+           PrintError("Invalid paging type (%s) specified in configuration. Defaulting to shadow paging\n", pg_type);
+           info->shdw_pg_mode = SHADOW_PAGING;
+       }
     } else {
-       PrintDebug("Guest Page Mode: SHADOW_PAGING\n");
-
+       PrintDebug("No paging type specified in configuration.\n");
        info->shdw_pg_mode = SHADOW_PAGING;
     }
 
+    if (info->shdw_pg_mode == NESTED_PAGING) {
+       PrintDebug("Guest Page Mode: NESTED_PAGING\n");
+    } else if (info->shdw_pg_mode == SHADOW_PAGING) {
+        PrintDebug("Guest Page Mode: SHADOW_PAGING\n");
+    } else {
+       PrintError("Guest paging mode incorrectly set.\n");
+       return -1;
+    }
+    return 0;
+}
 
-    v3_init_core(info);
+static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
 
+    if (determine_paging_mode(info, core_cfg))
+       return -1;
+
+    v3_init_core(info);
 
     if (info->vm_info->vm_class == V3_PC_VM) {
        if (pre_config_pc_core(info, core_cfg) == -1) {
@@ -316,6 +336,11 @@ static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
        return -1;
     }
 
+    if (v3_inject_mptable(vm)==-1) { 
+       PrintError("Failed to inject mptable during configuration\n");
+       return -1;
+    }
+
     return 0;
 }
 
@@ -415,11 +440,13 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) {
     for (i = 0; i < vm->num_cores; i++) {
        struct guest_info * info = &(vm->cores[i]);
 
-       
        info->cpu_id = i;
        info->vm_info = vm;
 
-       pre_config_core(info, per_core_cfg);
+       if (pre_config_core(info, per_core_cfg) == -1) {
+           PrintError("Error in core %d preconfiguration\n", i);
+           return NULL;
+       }
 
        per_core_cfg = v3_cfg_next_branch(per_core_cfg);
     }