From nobody Tue Jan 24 22:10:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1h3w5sJpz3bf16; Tue, 24 Jan 2023 22:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h3w32cQz4JjR; Tue, 24 Jan 2023 22:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jj53zgCoj4GxkA0ktJbT1lxkWw9MIVJT5NGEZvp2Rxo=; b=xh/Dln17SYNBrfkTzoaX3T/YfQB6SQuZOwDJcQN2v06KBA5zczEtXW8TTaD+i73TnMNOHn 2MQ55fdx3i8WZ2T3PzQ2XY3WA3gJj8ncodDMECNgQI2wPqepRFGypb4B7E7M4smi84/N3l NWBZ/GgFiJRwNdcNzpEKiKq2urJyuQYNjJJ8Lu5gHFwYCLrXPCzARMEankOKB/Sp+EHyxe OabzdVSl5rnTcMc+oeXmfYMWyoTTe166adWIY224ojdIvmcNKhA5lI/uiTvoMIBfRFCp5d TwCw/e26GN4jHiEG0NliwZIja2+G2O9weeDlQ96OfkZjn0Zrmb9whIrZJJZ7vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jj53zgCoj4GxkA0ktJbT1lxkWw9MIVJT5NGEZvp2Rxo=; b=SGwtzM10V5ByX5UyigktJDLU18o6L2/kZxSP/ZcgqhVPcteRuMY6c4ErIFFaY6+wSHpysr LQqfjYho8dyUni6lWqlXbHLlxGlpb3k4tRoc1+n6XJYiTA0rzqTYEXYtGEM1IV3pf75xj/ lxlgbQXg0cqivTxozZJDqT4E0WAbN9wyvSwuDjmEtE0plXl8Pk8yPP3Lqv1xAGNGyJVoZr cViWZP8vnZ9APEHFgcxX5Nw9xCf3/VhU3zeRxX3EubjyTqs5zSntdrJs2wDF4+37vgkZvv OCZszzJyABsNjlHYsxf7aeH3cZcWuabObMvCekrhcim+pbMfFv1OQDiUofZ9zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598220; a=rsa-sha256; cv=none; b=qk62MmOb4+NPZQb/v4wBl1LrdwVpo0pYvuwKW4GPp0Z+nrjA/0uqVT6Dn2IvpBOkI+MSxL u1z2x8OGu0MkiQfG7ljxAqTTbIRs3uZBePj0ADK1WuxmJUibC04roMx1gDexNkUf/cRSv6 H5bnLOHOv/BcuQeFRLEQ9Z6oFCQU2vbarkOnVFzfFfWbIJ7fFtHUCo3b5a7Q8Xuz1JSDSa rDZM4b6qRHmIwYwEoejcTbdfvGzjgK8TBnwmFGibjGdqYGo9qF/vhMcswD2TQ3YBGrlvEk X/mlU9CVTn3wV58X6rAaOaY+HmjL2UzNzV8+X7VHXLWkF4cfuepDU4xjSoFC2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h3w26dpzQ1G; Tue, 24 Jan 2023 22:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMAK6w079905; Tue, 24 Jan 2023 22:10:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAKDk079904; Tue, 24 Jan 2023 22:10:20 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:20 GMT Message-Id: <202301242210.30OMAKDk079904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5c1d95a60b54 - stable/13 - module_verbose should also affect non-ELF modules. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5c1d95a60b547508dec61802d4db1284744d44f4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5c1d95a60b547508dec61802d4db1284744d44f4 commit 5c1d95a60b547508dec61802d4db1284744d44f4 Author: Simon J. Gerraty AuthorDate: 2022-02-14 18:44:46 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:20 +0000 module_verbose should also affect non-ELF modules. (cherry picked from commit 01b0c35984c64dfbfb45abf26ad67df4761a2df5) --- 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) {