github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 09:47:44 +00:00
Code Issues Projects Releases Wiki Activity

hv: merge SBL and UEFI related stuff under boot

Browse Source 
This patch mainly unifies init_vm_boot_info's implementation between SBL and
UEFI.

Tracked-On: #2708
Signed-off-by: Tw <wei.tan@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Tw
2019-03-04 13:51:41 +08:00
committed by wenlingz
parent 56d8b08b78
commit 9b24620e16
13 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hypervisor/arch/x86/guest/vm.c
View File

@@ -23,6 +23,7 @@
#include <mmu.h>
#include <logmsg.h>
#include <cat.h>
#include <firmware.h>
vm_sw_loader_t vm_sw_loader;
@@ -329,7 +330,7 @@ int32_t create_vm(uint16_t vm_id, struct acrn_vm_config *vm_config, struct acrn_
create_sos_vm_e820(vm);
prepare_sos_vm_memmap(vm);
status = init_vm_boot_info(vm);
status = firmware_init_vm_boot_info(vm);
if (status == 0) {
init_fallback_iommu_domain(vm->iommu, vm->vm_id, vm->arch_vm.nworld_eptp);
} else {
@@ -358,7 +359,7 @@ int32_t create_vm(uint16_t vm_id, struct acrn_vm_config *vm_config, struct acrn_
#ifdef CONFIG_PARTITION_MODE
create_prelaunched_vm_e820(vm);
prepare_prelaunched_vm_memmap(vm, vm_config);
(void)init_vm_boot_info(vm);
(void)firmware_init_vm_boot_info(vm);
#endif
}

1
hypervisor/arch/x86/init.c
View File

@@ -14,6 +14,7 @@
#include <vmx.h>
#include <vm.h>
#include <logmsg.h>
#include <firmware.h>
/* Push sp magic to top of stack for call trace */
#define SWITCH_TO(rsp, to) \