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

rename function & definition from firmware to guest boot

Browse Source 
The interface struct & API changes like below:
  struct uefi_context->struct depri_boot_context
  init_firmware_operations()->init_vboot_operations()
  init_firmware()->init_vboot()
  firmware_init_irq()->init_vboot_irq()
  firmware_get_rsdp()->get_rsdp_ptr()
  firmware_get_ap_trampoline()->get_ap_trampoline_buf()
  firmware_init_vm_boot_info()->init_vm_boot_info()

Tracked-On: #1842
Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Jason Chen CJ
2019-04-30 15:56:58 +08:00
committed by Eddie Dong
parent 20f97f7559
commit 41ac9e5d10
16 changed files with 123 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/arch/x86/cpu.c
View File

@@ -116,7 +116,7 @@ void init_pcpu_pre(uint16_t pcpu_id_args)
*/
init_pcpu_capabilities();
init_firmware_operations();
init_vboot_operations();
init_pcpu_model_name();

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

@@ -363,7 +363,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 = firmware_init_vm_boot_info(vm);
status = init_vm_boot_info(vm);
if (status != 0) {
need_cleanup = true;
}
@@ -388,7 +388,7 @@ int32_t create_vm(uint16_t vm_id, struct acrn_vm_config *vm_config, struct acrn_
if (vm_config->load_order == PRE_LAUNCHED_VM) {
create_prelaunched_vm_e820(vm);
prepare_prelaunched_vm_memmap(vm, vm_config);
(void)firmware_init_vm_boot_info(vm);
(void)init_vm_boot_info(vm);
}
}

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

@@ -64,8 +64,8 @@ static void enter_guest_mode(uint16_t pcpu_id)
static void init_primary_pcpu_post(void)
{
/* Perform any necessary firmware initialization */
init_firmware();
/* Perform any necessary guest vboot initialization */
init_vboot();
init_debug_pre();

2
hypervisor/arch/x86/irq.c
View File

@@ -458,5 +458,5 @@ void init_interrupt(uint16_t pcpu_id)
init_lapic(pcpu_id);
init_default_irqs(pcpu_id);
firmware_init_irq();
init_vboot_irq();
}

2
hypervisor/arch/x86/trampoline.c
View File

@@ -110,7 +110,7 @@ uint64_t prepare_trampoline(void)
uint64_t size, dest_pa, i;
size = (uint64_t)(&ld_trampoline_end - &ld_trampoline_start);
dest_pa = firmware_get_ap_trampoline();
dest_pa = get_ap_trampoline_buf();
pr_dbg("trampoline code: %llx size %x", dest_pa, size);