can now boot linux (slowly) with EPT enabled

[palacios.git] / palacios / src / palacios / vmm_config_class.h

diff --git a/palacios/src/palacios/vmm_config_class.h b/palacios/src/palacios/vmm_config_class.h
index 1770a6f..df42ea6 100644 (file)
--- a/palacios/src/palacios/vmm_config_class.h
+++ b/palacios/src/palacios/vmm_config_class.h
@@ -22,17 +22,6 @@
 
 static int pre_config_pc_core(struct guest_info * info, v3_cfg_tree_t * cfg) { 
 
-    if (info->cpu_id!=0) { 
-       // I am an AP, so I will start in INIT mode,
-       // not in real mode.   This means I will wait for
-       // an INIT and then for a SIPI.   The SIPI will
-       // tell me where to start executing in real mode
-       info->cpu_mode = INIT;
-    } else {
-       // I am the MP, so I will start as normal
-       info->cpu_mode = REAL;
-    }
-
     info->mem_mode = PHYSICAL_MEM;
 
 
@@ -87,6 +76,13 @@ static int post_config_pc(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
        memcpy(rombios_dst, v3_rombios_start, v3_rombios_end - v3_rombios_start);
     }
 
+
+    if (vm->num_cores > 1) {
+       if (v3_inject_mptable(vm) == -1) { 
+           PrintError("Failed to inject mptable during configuration\n");
+           return -1;
+       }
+    }
     return 0;
 }