module_verbose should also affect non-ELF modules.
This commit is contained in:
parent
a9a43945d3
commit
01b0c35984
@ -605,7 +605,8 @@ file_load_dependencies(struct preloaded_file *base_file)
|
|||||||
verinfo = (struct mod_depend*)md->md_data;
|
verinfo = (struct mod_depend*)md->md_data;
|
||||||
dmodname = (char *)(verinfo + 1);
|
dmodname = (char *)(verinfo + 1);
|
||||||
if (file_findmodule(NULL, dmodname, verinfo) == NULL) {
|
if (file_findmodule(NULL, dmodname, verinfo) == NULL) {
|
||||||
printf("loading required module '%s'\n", dmodname);
|
if (module_verbose > MODULE_VERBOSE_SILENT)
|
||||||
|
printf("loading required module '%s'\n", dmodname);
|
||||||
error = mod_load(dmodname, verinfo, 0, NULL);
|
error = mod_load(dmodname, verinfo, 0, NULL);
|
||||||
if (error)
|
if (error)
|
||||||
break;
|
break;
|
||||||
@ -797,7 +798,8 @@ file_loadraw(const char *fname, char *type, int insert)
|
|||||||
if (archsw.arch_loadaddr != NULL)
|
if (archsw.arch_loadaddr != NULL)
|
||||||
loadaddr = archsw.arch_loadaddr(LOAD_RAW, name, loadaddr);
|
loadaddr = archsw.arch_loadaddr(LOAD_RAW, name, loadaddr);
|
||||||
|
|
||||||
printf("%s ", name);
|
if (module_verbose > MODULE_VERBOSE_SILENT)
|
||||||
|
printf("%s ", name);
|
||||||
|
|
||||||
laddr = loadaddr;
|
laddr = loadaddr;
|
||||||
for (;;) {
|
for (;;) {
|
||||||
@ -819,7 +821,8 @@ file_loadraw(const char *fname, char *type, int insert)
|
|||||||
laddr += got;
|
laddr += got;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("size=%#jx\n", (uintmax_t)(laddr - loadaddr));
|
if (module_verbose > MODULE_VERBOSE_SILENT)
|
||||||
|
printf("size=%#jx\n", (uintmax_t)(laddr - loadaddr));
|
||||||
#ifdef LOADER_VERIEXEC_VECTX
|
#ifdef LOADER_VERIEXEC_VECTX
|
||||||
verror = vectx_close(vctx, VE_MUST, __func__);
|
verror = vectx_close(vctx, VE_MUST, __func__);
|
||||||
if (verror) {
|
if (verror) {
|
||||||
|
Loading…
Reference in New Issue
Block a user