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=8f74a448f5d888e251158847e2d0b9fbdf3af43a;hpb=921772c23185aa48406a390c58546ee463f49dc4;p=palacios.git diff --git a/palacios/src/palacios/vmm_config_class.h b/palacios/src/palacios/vmm_config_class.h index 8f74a44..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 - +#include static int pre_config_pc_core(struct guest_info * info, v3_cfg_tree_t * cfg) { @@ -43,39 +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) { - -#define VGABIOS_START 0x000c0000 -#define ROMBIOS_START 0x000f0000 - - /* 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("Could not find VGABIOS destination address\n"); - return -1; - } - - 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[]; - 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"); - return -1; - } - - memcpy(rombios_dst, v3_rombios_start, v3_rombios_end - v3_rombios_start); - } - - return 0; +static int post_config_pc(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) +{ + return v3_setup_bioses(vm,cfg); }