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[];
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);
- }
-
- if (vm->num_cores>1 && !v3_find_dev(vm,"apic")) {
- PrintError("palacios: VM has more than one core, but no device named \"apic\"!\n");
- return -1;
- }
-
- if (v3_find_dev(vm,"apic")) {
- if (!v3_find_dev(vm,"ioapic")) {
- PrintError("palacios: VM cores have apics, but there is no device named \"ioapic\"!\n");
- }
- if (v3_inject_mptable(vm) == -1) {
- PrintError("Failed to inject mptable during configuration\n");
+#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;
}