X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config_class.h;h=95de131ff6602221f894c0f39c6148663051e49b;hb=749653dd91e8d012f77c9745421f2b7cd0d3da93;hp=7b867926ddc53f3e3ec0cecd7c876f67f13d8e22;hpb=1cc8fb21b4fdd6d2eb16742af13d60949e61d2ed;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config_class.h b/palacios/src/palacios/vmm_config_class.h
index 7b86792..95de131 100644
--- a/palacios/src/palacios/vmm_config_class.h
+++ b/palacios/src/palacios/vmm_config_class.h
@@ -17,8 +17,7 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#include <palacios/vm_guest_mem.h>
-
+#include <palacios/vmm_bios.h>
 
 static int pre_config_pc_core(struct guest_info * info, v3_cfg_tree_t * cfg) { 
 
@@ -43,58 +42,8 @@ static int post_config_pc_core(struct guest_info * info, v3_cfg_tree_t * cfg) {
     return 0;
 }
 
-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
-    /* layout vgabios */
-    {
-	extern uint8_t v3_vgabios_start[];
-	extern uint8_t v3_vgabios_end[];
-	void * vgabios_dst = 0;
-
-	if (v3_gpa_to_hva(&(vm->cores[0]), VGABIOS_START, (addr_t *)&vgabios_dst) == -1) {
-	    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]), 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;
+static int post_config_pc(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) 
+{ 
+    return v3_setup_bioses(vm,cfg);
 }