OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hv: multiboot: replace improper use of ASSERT with panic 

ASSERT could be used in some situations, such as, there are some pre-assumption
for some code, using ASSERT here for debug. It could not be used for detect error
when system booting where panic should be used.

Tracked-On: #861
Signed-off-by: Li, Fei1 <fei1.li@intel.com>
Acked-by: Eddie Dong <eddie.dong@inte.com>
This commit is contained in:
Li, Fei1 2019-01-30 19:52:43 +08:00 committed by wenlingz
parent 2474c60141
commit 9291fbe4d6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
int32_t ret = -EINVAL;
if (boot_regs[0] != MULTIBOOT_INFO_MAGIC) {
ASSERT(false, "no multiboot info found");
panic("no multiboot info found");
} else {
mbi = hpa2hva((uint64_t)boot_regs[1]);
if (mbi != NULL) {
@ -34,7 +34,7 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
dev_dbg(ACRN_DBG_BOOT, "Multiboot detected, flag=0x%x", mbi->mi_flags);
if ((mbi->mi_flags & MULTIBOOT_INFO_HAS_MODS) == 0U) {
clac();
ASSERT(false, "no kernel info found");
panic("no kernel info found");
} else {
dev_dbg(ACRN_DBG_BOOT, "mod counts=%d\n", mbi->mi_mods_count);
@ -163,7 +163,7 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
int32_t ret = -EINVAL;
if (boot_regs[0] != MULTIBOOT_INFO_MAGIC) {
ASSERT(false, "no multiboot info found");
panic("no multiboot info found");
} else {
mbi = (struct multiboot_info *)hpa2hva((uint64_t)boot_regs[1]);
@ -171,7 +171,7 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
stac();
dev_dbg(ACRN_DBG_BOOT, "Multiboot detected, flag=0x%x", mbi->mi_flags);
if ((mbi->mi_flags & MULTIBOOT_INFO_HAS_MODS) == 0U) {
ASSERT(false, "no sos kernel info found");
panic("no sos kernel info found");
clac();
} else {