X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config_class.h;h=9fcf197310a1427cf121437e21f0012ab65e5e05;hb=13d8e5d4035b90bf1ab8b1da115c7d6310c76526;hp=1770a6feaa07cf9dda0fe1e1a0a9908ab6a3ea20;hpb=6a686aa0cf80126e77d4f0f3a0eb882a7d302ae0;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config_class.h b/palacios/src/palacios/vmm_config_class.h
index 1770a6f..9fcf197 100644
--- 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,14 @@ 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;
 }