github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-14 14:25:14 +00:00
Code Issues Projects Releases Wiki Activity

Use exit instead of assert when checking images

Browse Source 
Print an error message and exit rather than using assert, so it is
more obvious what the problem is and no core files are produced.

Fixes #61

Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
This commit is contained in:
Icarus Sparry 2018-05-01 11:12:06 -07:00 committed by Jack Ren
parent 55bced400e
commit 7073173ec3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devicemodel/core/sw_load_bzimage.c
View File

@ -133,8 +133,11 @@ acrn_parse_kernel(char *arg)
if (len < STR_LEN) { if (len < STR_LEN) {
strncpy(kernel_path, arg, len); strncpy(kernel_path, arg, len);
kernel_path[len] = '\0'; kernel_path[len] = '\0';
assert(check_image(kernel_path) == 0); if (check_image(kernel_path) != 0){
fprintf(stderr, "SW_LOAD: check_image failed for '%s'\n",
kernel_path);
exit(10); /* Non-zero */
}
with_kernel = 1; with_kernel = 1;
printf("SW_LOAD: get kernel path %s\n", kernel_path); printf("SW_LOAD: get kernel path %s\n", kernel_path);
return 0; return 0;
@ -150,7 +153,11 @@ acrn_parse_ramdisk(char *arg)
if (len < STR_LEN) { if (len < STR_LEN) {
strncpy(ramdisk_path, arg, len); strncpy(ramdisk_path, arg, len);
ramdisk_path[len] = '\0'; ramdisk_path[len] = '\0';
assert(check_image(ramdisk_path) == 0); if (check_image(ramdisk_path) != 0){
fprintf(stderr, "SW_LOAD: check_image failed for '%s'\n",
ramdisk_path);
exit(11); /* Non-zero */
}
with_ramdisk = 1; with_ramdisk = 1;
printf("SW_LOAD: get ramdisk path %s\n", ramdisk_path); printf("SW_LOAD: get ramdisk path %s\n", ramdisk_path);