github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-21 21:19:35 +00:00
Code Issues Projects Releases Wiki Activity

HV: vm_load: refine api of get_bzimage_kernel_load_addr()

Browse Source 
As the previous commit said the kernel load address should be moved
from init_vm_sw_load() to vm_sw_loader() stage. This patch refines
the API of get_bzimage_kernel_load_addr() in init_vm_kernel_info()
for later use.

Tracked-On: #6323

Signed-off-by: Victor Sun <victor.sun@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
Victor Sun 2021-06-22 13:03:34 +08:00 committed by wenlingz
parent 33d226bf58
commit 2938eca363
1 changed files with 44 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hypervisor/boot/guest/vboot_info.c
View File

@ -145,15 +145,12 @@ static void init_vm_acpi_info(struct acrn_vm *vm, const struct abi_module *mod)
/** /**
* @pre vm != NULL * @pre vm != NULL
*/ */
static void *get_kernel_load_addr(struct acrn_vm *vm) static void *get_bzimage_kernel_load_addr(struct acrn_vm *vm)
{ {
void *load_addr = NULL; void *load_addr = NULL;
struct vm_sw_info *sw_info = &vm->sw; struct vm_sw_info *sw_info = &vm->sw;
struct zero_page *zeropage; struct zero_page *zeropage;
struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id);
switch (sw_info->kernel_type) {
case KERNEL_BZIMAGE:
/* According to the explaination for pref_address /* According to the explaination for pref_address
* in Documentation/x86/boot.txt, a relocating * in Documentation/x86/boot.txt, a relocating
* bootloader should attempt to load kernel at pref_address * bootloader should attempt to load kernel at pref_address
@ -196,14 +193,7 @@ static void *get_kernel_load_addr(struct acrn_vm *vm)
pr_err("Non-relocatable kernel found, risk to boot!"); pr_err("Non-relocatable kernel found, risk to boot!");
} }
} }
break;
case KERNEL_ZEPHYR:
load_addr = (void *)vm_config->os_config.kernel_load_addr;
break;
default:
pr_err("Unsupported Kernel type.");
break;
}
if (load_addr == NULL) { if (load_addr == NULL) {
pr_err("Could not get kernel load addr of VM %d .", vm->vm_id); pr_err("Could not get kernel load addr of VM %d .", vm->vm_id);
} }
@ -226,7 +216,13 @@ static int32_t init_vm_kernel_info(struct acrn_vm *vm, const struct abi_module *
vm->sw.kernel_info.kernel_src_addr = mod->start; vm->sw.kernel_info.kernel_src_addr = mod->start;
if (vm->sw.kernel_info.kernel_src_addr != NULL) { if (vm->sw.kernel_info.kernel_src_addr != NULL) {
vm->sw.kernel_info.kernel_size = mod->size; vm->sw.kernel_info.kernel_size = mod->size;
vm->sw.kernel_info.kernel_load_addr = get_kernel_load_addr(vm); if (vm->sw.kernel_type == KERNEL_BZIMAGE) {
vm->sw.kernel_info.kernel_load_addr = get_bzimage_kernel_load_addr(vm);
} else if (vm->sw.kernel_type == KERNEL_ZEPHYR) {
vm->sw.kernel_info.kernel_load_addr = (void *)vm_config->os_config.kernel_load_addr;
} else {
pr_err("Unsupported Kernel type.");
}
} }
return (vm->sw.kernel_info.kernel_load_addr == NULL) ? (-EINVAL) : 0; return (vm->sw.kernel_info.kernel_load_addr == NULL) ? (-EINVAL) : 0;