d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multiboot: fix error codes

Browse Source 
Return EINVAL instead of EFTYPE if we have a multiboot kernel loaded but
failed to load the modules. This makes it clear that the kernel/module
should be handled by the multiboot handler but something went wrong.

Sponsored by: Citrix Systems R&D
This commit is contained in:
Roger Pau Monné 2015-04-01 10:10:20 +00:00
parent e1c124dc44
commit 63f13cedca
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/boot/i386/libi386/multiboot.c
View File

@ -243,7 +243,7 @@ multiboot_exec(struct preloaded_file *fp)
/* Find the entry point of the Xen kernel and save it for later */
if ((md = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) {
printf("Unable to find %s entry point\n", fp->f_name);
error = EFTYPE;
error = EINVAL;
goto error;
}
ehdr = (Elf_Ehdr *)&(md->md_data);
@ -271,7 +271,7 @@ multiboot_exec(struct preloaded_file *fp)
fp = file_findfile(NULL, "elf kernel");
if (fp == NULL) {
printf("No FreeBSD kernel provided, aborting\n");
error = EFTYPE;
error = EINVAL;
goto error;
}
@ -380,7 +380,7 @@ multiboot_obj_loadfile(char *filename, u_int64_t dest,
printf(
"Unable to load %s as a multiboot payload kernel\n",
filename);
return (EFTYPE);
return (EINVAL);
}
/* Load kernel metadata... */
@ -389,7 +389,7 @@ multiboot_obj_loadfile(char *filename, u_int64_t dest,
if (error) {
printf("Unable to load kernel %s metadata error: %d\n",
rfp->f_name, error);
return (EFTYPE);
return (EINVAL);
}
/*