github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-15 13:59:18 +00:00
Code Issues Projects Releases Wiki Activity

vm load: fix bug in loading kernel

Browse Source 
According to the explaination for pref_address
in Documentation/x86/boot.txt, a relocating bootloader
should attempt to load kernel at pref_address if possible.
But due to a non-relocatable kernel will unconditionally
move itself and to run at perf address, no need to copy
kernel to perf_address by bootloader.

Signed-off-by: Zheng, Gen <gen.zheng@intel.com>
This commit is contained in:
Zheng, Gen
2018-03-20 14:05:47 +08:00
committed by Jack Ren
parent b6d73be1a6
commit 124910ba14
4 changed files with 87 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hypervisor/boot/multiboot.c
View File

@@ -37,6 +37,7 @@
#include <acrn_hv_defs.h>
#include <hv_debug.h>
#include <multiboot.h>
#include <zeropage.h>
#define BOOT_ARGS_LOAD_ADDR 0x24EFC000
@@ -102,6 +103,25 @@ static void parse_other_modules(struct vm *vm,
}
}
static void *get_kernel_load_addr(void *kernel_src_addr)
{
struct zero_page *zeropage;
/* According to the explaination for pref_address
* in Documentation/x86/boot.txt, a relocating
* bootloader should attempt to load kernel at pref_address
* if possible. A non-relocatable kernel will unconditionally
* move itself and to run at this address, so no need to copy
* kernel to perf_address by bootloader, if kernel is
* non-relocatable.
*/
zeropage = (struct zero_page *)kernel_src_addr;
if (zeropage->hdr.relocatable_kernel)
return (void *)zeropage->hdr.pref_addr;
return kernel_src_addr;
}
int init_vm0_boot_info(struct vm *vm)
{
struct multiboot_module *mods = NULL;
@@ -141,7 +161,7 @@ int init_vm0_boot_info(struct vm *vm)
vm->sw.kernel_info.kernel_size =
mods[0].mm_mod_end - mods[0].mm_mod_start;
vm->sw.kernel_info.kernel_load_addr =
(void *)(uint64_t)mods[0].mm_mod_start;
get_kernel_load_addr(vm->sw.kernel_info.kernel_src_addr);
vm->sw.linux_info.bootargs_src_addr =
(void *)(uint64_t)mods[0].mm_string;