X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config_class.h;h=1770a6feaa07cf9dda0fe1e1a0a9908ab6a3ea20;hb=cd3edffa0e451af761b9dcee021ca06ebb301345;hp=bb337c7e3ede4f97fa3c8ff5fc3ae21049652afe;hpb=14fa18cc54571eaa7aaa0f7d55677bdb4dad81a6;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config_class.h b/palacios/src/palacios/vmm_config_class.h
index bb337c7..1770a6f 100644
--- a/palacios/src/palacios/vmm_config_class.h
+++ b/palacios/src/palacios/vmm_config_class.h
@@ -22,8 +22,17 @@
 
 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->cpu_mode = REAL;
     info->mem_mode = PHYSICAL_MEM;
 
 
@@ -54,30 +63,28 @@ static int post_config_pc(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     {
 	extern uint8_t v3_vgabios_start[];
 	extern uint8_t v3_vgabios_end[];
-	addr_t vgabios_dst = 0;
+	void * vgabios_dst = 0;
 
-	if (v3_gpa_to_hpa(&(vm->cores[0]), VGABIOS_START, &vgabios_dst) == -1) {
+	if (v3_gpa_to_hva(&(vm->cores[0]), VGABIOS_START, (addr_t *)&vgabios_dst) == -1) {
 	    PrintError("Could not find VGABIOS destination address\n");
 	    return -1;
 	}
 
-	memcpy(V3_VAddr((void *)vgabios_dst), v3_vgabios_start, 
-	       v3_vgabios_end - v3_vgabios_start);	
+	memcpy(vgabios_dst, v3_vgabios_start, v3_vgabios_end - v3_vgabios_start);	
     }
     
     /* layout rombios */
     {
 	extern uint8_t v3_rombios_start[];
 	extern uint8_t v3_rombios_end[];
-	addr_t rombios_dst = 0;
+	void * rombios_dst = 0;
 	
-	if (v3_gpa_to_hpa(&(vm->cores[0]), ROMBIOS_START, &rombios_dst) == -1) {
+	if (v3_gpa_to_hva(&(vm->cores[0]), ROMBIOS_START, (addr_t *)&rombios_dst) == -1) {
 	    PrintError("Could not find ROMBIOS destination address\n");
 	    return -1;
 	}
 
-	memcpy(V3_VAddr((void *)rombios_dst), v3_rombios_start, 
-	       v3_rombios_end - v3_rombios_start);
+	memcpy(rombios_dst, v3_rombios_start, v3_rombios_end - v3_rombios_start);
     }
 
     return 0;