X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config_class.h;h=7b867926ddc53f3e3ec0cecd7c876f67f13d8e22;hb=6fa605075d1944da0a88a389122ea24bbc583329;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..7b86792 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;
 
 
@@ -56,9 +45,10 @@ static int post_config_pc_core(struct guest_info * info, v3_cfg_tree_t * cfg) {
 
 static int post_config_pc(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
+
+#if defined(V3_CONFIG_SEABIOS) || defined(V3_CONFIG_BOCHSBIOS)
+
 #define VGABIOS_START 0x000c0000
-#define ROMBIOS_START 0x000f0000
-    
     /* layout vgabios */
     {
 	extern uint8_t v3_vgabios_start[];
@@ -66,27 +56,45 @@ static int post_config_pc(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 	void * vgabios_dst = 0;
 
 	if (v3_gpa_to_hva(&(vm->cores[0]), VGABIOS_START, (addr_t *)&vgabios_dst) == -1) {
-	    PrintError("Could not find VGABIOS destination address\n");
+	    PrintError(vm, VCORE_NONE, "Could not find VGABIOS destination address\n");
 	    return -1;
 	}
 
+	V3_Print(vm,VCORE_NONE,"Mapping VGA BIOS of %llu bytes at address %p\n", (uint64_t)(v3_vgabios_end-v3_vgabios_start), (void*)VGABIOS_START);
 	memcpy(vgabios_dst, v3_vgabios_start, v3_vgabios_end - v3_vgabios_start);	
     }
     
+#endif
+
+
     /* layout rombios */
     {
 	extern uint8_t v3_rombios_start[];
 	extern uint8_t v3_rombios_end[];
 	void * rombios_dst = 0;
 	
-	if (v3_gpa_to_hva(&(vm->cores[0]), ROMBIOS_START, (addr_t *)&rombios_dst) == -1) {
-	    PrintError("Could not find ROMBIOS destination address\n");
+	if (v3_gpa_to_hva(&(vm->cores[0]), V3_CONFIG_BIOS_START, (addr_t *)&rombios_dst) == -1) {
+	    PrintError(vm, VCORE_NONE, "Could not find ROMBIOS destination address\n");
 	    return -1;
 	}
 
+	V3_Print(vm,VCORE_NONE,"Mapping BIOS of %llu bytes at address %p\n", (uint64_t)(v3_rombios_end-v3_rombios_start), (void*)V3_CONFIG_BIOS_START);
 	memcpy(rombios_dst, v3_rombios_start, v3_rombios_end - v3_rombios_start);
+
+#ifdef V3_CONFIG_SEABIOS
+	// SEABIOS is also mapped into end of 4GB region
+	if (v3_add_shadow_mem(vm, V3_MEM_CORE_ANY, 
+			      0xfffe0000, 0xffffffff,
+			      (addr_t)V3_PAddr(rombios_dst)) == -1) {
+	    PrintError(vm, VCORE_NONE, "Error mapping SEABIOS to end of memory\n");
+	    return -1;
+	}
+	V3_Print(vm,VCORE_NONE,"Additionally mapping SEABIOS of %llu bytes at address %p\n", (uint64_t)(v3_rombios_end-v3_rombios_start), (void*)0xfffe0000);
+#endif
+
     }
 
+
     return 0;
 }