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=b2edaeebe2c42f5aabfdaf70135c678046a30185;hpb=5bf6d0c260240e314876a2fca8e3fd56bd6a1029;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config_class.h b/palacios/src/palacios/vmm_config_class.h
index b2edaee..95de131 100644
--- a/palacios/src/palacios/vmm_config_class.h
+++ b/palacios/src/palacios/vmm_config_class.h
@@ -17,11 +17,10 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
+#include <palacios/vmm_bios.h>
 
-static int pre_config_pc(struct guest_info * info, struct v3_config * config_ptr) {
+static int pre_config_pc_core(struct guest_info * info, v3_cfg_tree_t * cfg) { 
 
-
-    info->cpu_mode = REAL;
     info->mem_mode = PHYSICAL_MEM;
 
 
@@ -37,31 +36,14 @@ static int pre_config_pc(struct guest_info * info, struct v3_config * config_ptr
     return 0;
 }
 
-static int post_config_pc(struct guest_info * info, struct v3_config * config_ptr) {
-
-#define VGABIOS_START 0x000c0000
-#define ROMBIOS_START 0x000f0000
-    
-    /* layout vgabios */
-    {
-	extern uint8_t v3_vgabios_start[];
-	extern uint8_t v3_vgabios_end[];
-	
-	addr_t vgabios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), VGABIOS_START);
-	memcpy(V3_VAddr((void *)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 = v3_get_shadow_addr(&(info->mem_map.base_region), ROMBIOS_START);
-	memcpy(V3_VAddr((void *)rombios_dst), v3_rombios_start, v3_rombios_end - v3_rombios_start);
-    }
-
-    v3_print_mem_map(info);
+static int post_config_pc_core(struct guest_info * info, v3_cfg_tree_t * cfg) { 
 
+    v3_print_mem_map(info->vm_info);
     return 0;
 }
 
+static int post_config_pc(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) 
+{ 
+    return v3_setup_bioses(vm,cfg);
+}
+