github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-30 17:22:09 +00:00
Code Issues Projects Releases Wiki Activity

HV: code style change for multiboot.c

Browse Source 
- to make sure procedure has one exit point;

- add NULL pointer check;

Tracked-On: #861
Signed-off-by: Victor Sun <victor.sun@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Victor Sun 2018-12-27 21:40:22 +08:00 committed by Eddie Dong
parent dff6781293
commit 5c278cc57b
1 changed files with 125 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
hypervisor/boot/sbl/multiboot.c
View File

@ -21,22 +21,19 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
{ {
struct multiboot_module *mods = NULL; struct multiboot_module *mods = NULL;
struct multiboot_info *mbi = NULL; struct multiboot_info *mbi = NULL;
int32_t ret = -EINVAL;
if (boot_regs[0] != MULTIBOOT_INFO_MAGIC) { if (boot_regs[0] != MULTIBOOT_INFO_MAGIC) {
ASSERT(false, "no multiboot info found"); ASSERT(false, "no multiboot info found");
return -EINVAL; } else {
}
mbi = hpa2hva((uint64_t)boot_regs[1]); mbi = hpa2hva((uint64_t)boot_regs[1]);
if (mbi != NULL) {
stac(); stac();
dev_dbg(ACRN_DBG_BOOT, "Multiboot detected, flag=0x%x", mbi->mi_flags); dev_dbg(ACRN_DBG_BOOT, "Multiboot detected, flag=0x%x", mbi->mi_flags);
if ((mbi->mi_flags & MULTIBOOT_INFO_HAS_MODS) == 0U) { if ((mbi->mi_flags & MULTIBOOT_INFO_HAS_MODS) == 0U) {
clac(); clac();
ASSERT(false, "no kernel info found"); ASSERT(false, "no kernel info found");
return -EINVAL; } else {
}
dev_dbg(ACRN_DBG_BOOT, "mod counts=%d\n", mbi->mi_mods_count); dev_dbg(ACRN_DBG_BOOT, "mod counts=%d\n", mbi->mi_mods_count);
/* mod[0] is for kernel&cmdline, other mod for ramdisk/firmware info*/ /* mod[0] is for kernel&cmdline, other mod for ramdisk/firmware info*/
@ -44,26 +41,22 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
dev_dbg(ACRN_DBG_BOOT, "mod0 start=0x%x, end=0x%x", dev_dbg(ACRN_DBG_BOOT, "mod0 start=0x%x, end=0x%x",
mods[0].mm_mod_start, mods[0].mm_mod_end); mods[0].mm_mod_start, mods[0].mm_mod_end);
dev_dbg(ACRN_DBG_BOOT, "cmd addr=0x%x, str=%s", mods[0].mm_string, dev_dbg(ACRN_DBG_BOOT, "cmd addr=0x%x, str=%s",
(char *) (uint64_t)mods[0].mm_string); mods[0].mm_string, (char *)(uint64_t)mods[0].mm_string);
vm->sw.kernel_type = VM_LINUX_GUEST; vm->sw.kernel_type = VM_LINUX_GUEST;
vm->sw.kernel_info.kernel_src_addr = vm->sw.kernel_info.kernel_src_addr = hpa2hva((uint64_t)mods[0].mm_mod_start);
hpa2hva((uint64_t)mods[0].mm_mod_start); vm->sw.kernel_info.kernel_size = mods[0].mm_mod_end - mods[0].mm_mod_start;
vm->sw.kernel_info.kernel_size =
mods[0].mm_mod_end - mods[0].mm_mod_start;
vm->sw.kernel_info.kernel_load_addr = (void *)(16 * 1024 * 1024UL); vm->sw.kernel_info.kernel_load_addr = (void *)(16 * 1024 * 1024UL);
vm->sw.linux_info.bootargs_src_addr = (void *)vm->vm_desc->bootargs;
vm->sw.linux_info.bootargs_src_addr = vm->sw.linux_info.bootargs_size = strnlen_s(vm->vm_desc->bootargs, MEM_2K);
(void *)vm->vm_desc->bootargs;
vm->sw.linux_info.bootargs_size =
strnlen_s(vm->vm_desc->bootargs, MEM_2K);
vm->sw.linux_info.bootargs_load_addr = (void *)(vm->vm_desc->mem_size - 8*1024UL); vm->sw.linux_info.bootargs_load_addr = (void *)(vm->vm_desc->mem_size - 8*1024UL);
clac(); clac();
ret = 0;
return 0; }
}
}
return ret;
} }
#else #else
@ -75,8 +68,7 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
static char kernel_cmdline[MEM_2K]; static char kernel_cmdline[MEM_2K];
/* now modules support: FIRMWARE & RAMDISK & SeedList */ /* now modules support: FIRMWARE & RAMDISK & SeedList */
static void parse_other_modules(struct acrn_vm *vm, static void parse_other_modules(struct acrn_vm *vm, const struct multiboot_module *mods, uint32_t mods_count)
const struct multiboot_module *mods, uint32_t mods_count)
{ {
uint32_t i; uint32_t i;
@ -104,14 +96,12 @@ static void parse_other_modules(struct acrn_vm *vm,
type_len = end - start; type_len = end - start;
if (strncmp("FIRMWARE", start, type_len) == 0) { if (strncmp("FIRMWARE", start, type_len) == 0) {
char dyn_bootargs[100] = {'\0'}; char dyn_bootargs[100] = {'\0'};
void *load_addr = gpa2hva(vm, void *load_addr = gpa2hva(vm, (uint64_t)vm->sw.linux_info.bootargs_load_addr);
(uint64_t)vm->sw.linux_info.bootargs_load_addr);
uint32_t args_size = vm->sw.linux_info.bootargs_size; uint32_t args_size = vm->sw.linux_info.bootargs_size;
static int32_t copy_once = 1; static int32_t copy_once = 1;
start = end + 1; /*it is fw name for boot args */ start = end + 1; /*it is fw name for boot args */
snprintf(dyn_bootargs, 100U, " %s=0x%x@0x%x ", snprintf(dyn_bootargs, 100U, " %s=0x%x@0x%x ", start, mod_size, mod_addr);
start, mod_size, mod_addr);
dev_dbg(ACRN_DBG_BOOT, "fw-%d: %s", i, dyn_bootargs); dev_dbg(ACRN_DBG_BOOT, "fw-%d: %s", i, dyn_bootargs);
/*copy boot args to load addr, set src=load addr*/ /*copy boot args to load addr, set src=load addr*/
@ -123,13 +113,11 @@ static void parse_other_modules(struct acrn_vm *vm,
} }
(void)strncpy_s(load_addr + args_size, 100U, dyn_bootargs, 100U); (void)strncpy_s(load_addr + args_size, 100U, dyn_bootargs, 100U);
vm->sw.linux_info.bootargs_size = vm->sw.linux_info.bootargs_size = strnlen_s(load_addr, MEM_2K);
strnlen_s(load_addr, MEM_2K);
} else if (strncmp("RAMDISK", start, type_len) == 0) { } else if (strncmp("RAMDISK", start, type_len) == 0) {
vm->sw.linux_info.ramdisk_src_addr = mod_addr; vm->sw.linux_info.ramdisk_src_addr = mod_addr;
vm->sw.linux_info.ramdisk_load_addr = vm->sw.linux_info.ramdisk_load_addr = (void *)(uint64_t)mods[i].mm_mod_start;
(void *)(uint64_t)mods[i].mm_mod_start;
vm->sw.linux_info.ramdisk_size = mod_size; vm->sw.linux_info.ramdisk_size = mod_size;
} else { } else {
pr_warn("not support mod, cmd: %s", start); pr_warn("not support mod, cmd: %s", start);
@ -170,21 +158,20 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
{ {
struct multiboot_module *mods = NULL; struct multiboot_module *mods = NULL;
struct multiboot_info *mbi = NULL; struct multiboot_info *mbi = NULL;
int32_t ret = -EINVAL;
if (boot_regs[0] != MULTIBOOT_INFO_MAGIC) { if (boot_regs[0] != MULTIBOOT_INFO_MAGIC) {
ASSERT(false, "no multiboot info found"); ASSERT(false, "no multiboot info found");
return -EINVAL; } else {
}
mbi = (struct multiboot_info *)hpa2hva((uint64_t)boot_regs[1]); mbi = (struct multiboot_info *)hpa2hva((uint64_t)boot_regs[1]);
if (mbi != NULL) {
stac(); stac();
dev_dbg(ACRN_DBG_BOOT, "Multiboot detected, flag=0x%x", mbi->mi_flags); dev_dbg(ACRN_DBG_BOOT, "Multiboot detected, flag=0x%x", mbi->mi_flags);
if ((mbi->mi_flags & MULTIBOOT_INFO_HAS_MODS) == 0U) { if ((mbi->mi_flags & MULTIBOOT_INFO_HAS_MODS) == 0U) {
ASSERT(false, "no sos kernel info found"); ASSERT(false, "no sos kernel info found");
clac(); clac();
return -EINVAL; } else {
}
dev_dbg(ACRN_DBG_BOOT, "mod counts=%d\n", mbi->mi_mods_count); dev_dbg(ACRN_DBG_BOOT, "mod counts=%d\n", mbi->mi_mods_count);
@ -194,15 +181,13 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
dev_dbg(ACRN_DBG_BOOT, "mod0 start=0x%x, end=0x%x", dev_dbg(ACRN_DBG_BOOT, "mod0 start=0x%x, end=0x%x",
mods[0].mm_mod_start, mods[0].mm_mod_end); mods[0].mm_mod_start, mods[0].mm_mod_end);
dev_dbg(ACRN_DBG_BOOT, "cmd addr=0x%x, str=%s", mods[0].mm_string, dev_dbg(ACRN_DBG_BOOT, "cmd addr=0x%x, str=%s", mods[0].mm_string,
(char *) (uint64_t)mods[0].mm_string); (char *)(uint64_t)mods[0].mm_string);
vm->sw.kernel_type = VM_LINUX_GUEST; vm->sw.kernel_type = VM_LINUX_GUEST;
vm->sw.kernel_info.kernel_src_addr = vm->sw.kernel_info.kernel_src_addr = hpa2hva((uint64_t)mods[0].mm_mod_start);
hpa2hva((uint64_t)mods[0].mm_mod_start); vm->sw.kernel_info.kernel_size = mods[0].mm_mod_end - mods[0].mm_mod_start;
vm->sw.kernel_info.kernel_size = vm->sw.kernel_info.kernel_load_addr =
mods[0].mm_mod_end - mods[0].mm_mod_start; (void *)hva2gpa(vm, get_kernel_load_addr(vm->sw.kernel_info.kernel_src_addr));
vm->sw.kernel_info.kernel_load_addr = (void *)hva2gpa(vm,
get_kernel_load_addr(vm->sw.kernel_info.kernel_src_addr));
/* /*
* If there is cmdline from mbi->mi_cmdline, merge it with * If there is cmdline from mbi->mi_cmdline, merge it with
@ -232,13 +217,12 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
/* /*
* append the seed argument to kernel cmdline * append the seed argument to kernel cmdline
*/ */
(void)strncpy_s(cmd_dst, MEM_2K, buf, (void)strncpy_s(cmd_dst, MEM_2K, buf, MAX_BOOT_PARAMS_LEN);
MAX_BOOT_PARAMS_LEN);
off = strnlen_s(cmd_dst, MEM_2K); off = strnlen_s(cmd_dst, MEM_2K);
} }
cmd_dst += off; cmd_dst += off;
(void)strncpy_s(cmd_dst, MEM_2K - off, cmd_src, (void)strncpy_s(cmd_dst, MEM_2K - off, (const char *)cmd_src,
strnlen_s(cmd_src, MEM_2K - off)); strnlen_s(cmd_src, MEM_2K - off));
off = strnlen_s(cmd_dst, MEM_2K - off); off = strnlen_s(cmd_dst, MEM_2K - off);
cmd_dst[off] = ' '; /* insert space */ cmd_dst[off] = ' '; /* insert space */
@ -250,14 +234,11 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
strnlen_s(cmd_src, MEM_2K - off)); strnlen_s(cmd_src, MEM_2K - off));
vm->sw.linux_info.bootargs_src_addr = kernel_cmdline; vm->sw.linux_info.bootargs_src_addr = kernel_cmdline;
vm->sw.linux_info.bootargs_size = vm->sw.linux_info.bootargs_size = strnlen_s(kernel_cmdline, MEM_2K);
strnlen_s(kernel_cmdline, MEM_2K);
} else { } else {
vm->sw.linux_info.bootargs_src_addr = vm->sw.linux_info.bootargs_src_addr = hpa2hva((uint64_t)mods[0].mm_string);
hpa2hva((uint64_t)mods[0].mm_string);
vm->sw.linux_info.bootargs_size = vm->sw.linux_info.bootargs_size =
strnlen_s(hpa2hva((uint64_t)mods[0].mm_string), strnlen_s(hpa2hva((uint64_t)mods[0].mm_string), MEM_2K);
MEM_2K);
} }
vm->sw.linux_info.bootargs_load_addr = (void *)BOOT_ARGS_LOAD_ADDR; vm->sw.linux_info.bootargs_load_addr = (void *)BOOT_ARGS_LOAD_ADDR;
@ -267,6 +248,10 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
parse_other_modules(vm, mods + 1, mbi->mi_mods_count - 1); parse_other_modules(vm, mods + 1, mbi->mi_mods_count - 1);
} }
clac(); clac();
return 0; ret = 0;
}
}
}
return ret;
} }
#endif #endif