The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=01b0c35984c64dfbfb45abf26ad67df4761a2df5
commit 01b0c35984c64dfbfb45abf26ad67df4761a2df5 Author: Simon J. Gerraty <[email protected]> AuthorDate: 2022-02-14 18:44:46 +0000 Commit: Simon J. Gerraty <[email protected]> CommitDate: 2022-02-14 18:44:46 +0000 module_verbose should also affect non-ELF modules. --- stand/common/module.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/stand/common/module.c b/stand/common/module.c index bf95fbc59ea3..43c04728b4fa 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -605,7 +605,8 @@ file_load_dependencies(struct preloaded_file *base_file) verinfo = (struct mod_depend*)md->md_data; dmodname = (char *)(verinfo + 1); 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); if (error) break; @@ -797,7 +798,8 @@ file_loadraw(const char *fname, char *type, int insert) if (archsw.arch_loadaddr != NULL) loadaddr = archsw.arch_loadaddr(LOAD_RAW, name, loadaddr); - printf("%s ", name); + if (module_verbose > MODULE_VERBOSE_SILENT) + printf("%s ", name); laddr = loadaddr; for (;;) { @@ -819,7 +821,8 @@ file_loadraw(const char *fname, char *type, int insert) 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 verror = vectx_close(vctx, VE_MUST, __func__); if (verror) {
