From nobody Mon Feb 14 18:45:36 2022 X-Original-To: dev-commits-src-main@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 A4A3119BE419; Mon, 14 Feb 2022 18:45:36 +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 4JyCpS4Cgwz3vqW; Mon, 14 Feb 2022 18:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644864336; 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=01AIktFhtlHHK+FTjQfUUKjNWExPCuDWZ27icmkqk5s=; b=hS2P3Tshp6i4ddLpmqsJrK5pEzAgLGQikVdpgfxr8Y+EKRhmvxWhSjlQ1vSeJr7JkeEPhV caS8J6SORXnWLn8UPKSw1gHWs4BAFj41EcP/5W9I6CHSTFD5w7lCb40M1eM+HKe7dMuDj7 WL9HV+vUaQdKNfL5LmEL3voTJE353ycs1+TKU2WgUUdsxJNZ2TgxNm/Z2fs0DmQM8kkXHq hOOdEWtfdgg9Z+7AC1Oq2BYSI97Qa3sGvLZtMCTYyuArjVhFO4NZ0eztxVlvnc8UNT+HmP mNGXrIhW6VmoUQ5jeVRJvkbDlNdkP1o4mlBeuULd3XC0tJZkF6q8NjXNR+YokQ== 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 6CAB414083; Mon, 14 Feb 2022 18:45:36 +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 21EIjavp054343; Mon, 14 Feb 2022 18:45:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21EIja0X054342; Mon, 14 Feb 2022 18:45:36 GMT (envelope-from git) Date: Mon, 14 Feb 2022 18:45:36 GMT Message-Id: <202202141845.21EIja0X054342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 01b0c35984c6 - main - module_verbose should also affect non-ELF modules. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01b0c35984c64dfbfb45abf26ad67df4761a2df5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644864336; 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=01AIktFhtlHHK+FTjQfUUKjNWExPCuDWZ27icmkqk5s=; b=noriyt73dl2vs4FJazpBhC6xazC1qfGvNeMyUarT7253sDAzVQ2CXGQXHgG1FQpEDuGCKu wXtFYJGWVd1KZd4a3tvwk17rJ+NPjc+XhQvBTFXwLmdaG2mIoN+3L0eTRLfekT6+3mRiRW A57vLy1syGDpd9g7xokDvi4NXBNzeSHckzh8DrRRnZQhazM20iK0caxLX0JYSckhwh86MX Y3TCaJ+im1k6e4z8tLitVRegE8AzJfsCl4lEgwp81vNK08vIWxoDdvIlm/yQP7u294OtBt gZjid+r7e6MKSebuzCfLuDQE7de4LAP+BUfeI/fjcFh17Bub6D2MsvSXWS9fUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644864336; a=rsa-sha256; cv=none; b=KlSuEyUtV+UK4sHjNinoTzrap6jNp7j5ACGntxT7oiEKjW1vRdlIQuc2jUAvYBbBjZ0WOs jGDT/1lZhOSaIhg8qEh8ASJoT9PPHIFR/sxYyHX1n+n6nDMv5U5g0BT1G5NiZlZcfnK/sq xbW6GzP2+Fi9oeXov17IMRa/1YEmfRSPaSP0jFUsJtNYP01Gl770TJMsqpPXsNKs0HLkeP ds6Jq/HwgG0p4HKvPVXjHjxiwy1LeQ0tWm3+NDbpsR6IdA4MAGSbdGthaaBMnqRnmR0Uwq MEU+BUMIPgqtDHjD58eaZ0kKZdtbUqdN/BQrYUd4iNLXvYNaf7o4oLqe5TXDqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=01b0c35984c64dfbfb45abf26ad67df4761a2df5 commit 01b0c35984c64dfbfb45abf26ad67df4761a2df5 Author: Simon J. Gerraty AuthorDate: 2022-02-14 18:44:46 +0000 Commit: Simon J. Gerraty 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) {