From nobody Tue Aug 15 22:57:10 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 4RQRVG2ls6z4mKjq; Tue, 15 Aug 2023 22:57:10 +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 4RQRVG2Gvnz4M36; Tue, 15 Aug 2023 22:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692140230; 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=x5Nd1cW1zhgpYTgY9zAq5ANfbW+f5d76FO78jsB9HZE=; b=WB+X2RxjPJ1IHaz5mZGWzyAvvW4PW1OFU7ftx+J6OdMHFbuV5x0c2jqc3gvI8K4KXMmnnJ 9XTYrL1DNdvnLtLz8w4VN9rEwYCyQkbXvnSGiu9kKz04XSwWg59yviWCUgzLMr2ptx+Yd0 eOTXrPZayt4Z2I7HXtUJ41VHLYugNkUdHHkXcRJbjfGX09vNfLt2sZ+m1VUdddGz7hwnvk B8PLQ5co/jri1sHw2sAYyuFDwlmUv+lD1RQu0hulLQbS2vmMWX+u5ciFbgwCs7Q1LXR+7j A8mMgD+ZsJ7Z8w/W3QXgaPI/d/QOSO2nc59J0OBeCAG5qCuPHIY1uilP+21w4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692140230; 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=x5Nd1cW1zhgpYTgY9zAq5ANfbW+f5d76FO78jsB9HZE=; b=kJSqYQoDnOSFI0eq+iWiDb2q2yO4BLrgTVjyGMuaVnGYGia9kG5VdxKeyQRGW4a5bOXalf 4K7h9bAo6hUVqAxti5PEOWXfvFG10nYMoy0cgPyz40RDDgoQLiiVpra4Sen/WF5AQ/oawl /AYBcHXzU78LiUQJ3KKWYx/4ElppLb0r91zAh4EP9Pk+UyaVBRd7O15n6Ge2DNojPkrZid P80AJp1Xhr4z7sVN/QpUC4VvrgqJeVYcFiPwYzXtNJhwP+loFF+WGFJKstfD+9aCV1Zjyw Px20VsALpBf/BPxKDvBigUvfOmeVztTBje7Jzl7lvZniE4oZ+jvhEpYF79xkPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692140230; a=rsa-sha256; cv=none; b=eTR5gmHfLwn2Yf1+8Zo8jtk1lwdUo30m0tl5CIh/v6EOYA/qDWsvB4p7mErF4bQhztIUP3 ZDTHn2H7bPtyTxqZiFR7kUwBRy9LMOxZ39/A5f3S4K2pmOGN+GA+5PucFgAurLpYQ4DX4M DzKBo4Jr8IwT+9W0ibwCB8Xhb1tlKdod1q6CZDfGWKG3ObiDk00LhMfV5TkGd6FI5JWr5+ NfQpAlr/5DBIDe5g9D8/8bcdGjuVS2QgzRWWec2YWzA1/iErqMs0/1Rg/FT6mITZS3i5pv TkENk9rWh/a19FTUX2OdQGnAn+juOYhQKBk4XDGHfeRRDiCfe96xSsCSFR9Wuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQRVG1LsZzDTp; Tue, 15 Aug 2023 22:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FMvA9j058875; Tue, 15 Aug 2023 22:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FMvAeQ058872; Tue, 15 Aug 2023 22:57:10 GMT (envelope-from git) Date: Tue, 15 Aug 2023 22:57:10 GMT Message-Id: <202308152257.37FMvAeQ058872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a1df36f1b99b - main - devmatch: introduce quiet command line option 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1df36f1b99bf2b8dcee66327f55888667fa4b2f Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a1df36f1b99bf2b8dcee66327f55888667fa4b2f commit a1df36f1b99bf2b8dcee66327f55888667fa4b2f Author: Bjoern A. Zeeb AuthorDate: 2023-08-13 21:33:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-15 22:54:48 +0000 devmatch: introduce quiet command line option In setups without hints whatsoever one can get a long list of "Can't read linker hints file" error messages during boot. Add a -q/--quiet option which would suppress the noise and leave space for more essential information. While here switch to a pre-defined exit code from sysexits. MFC after: 4 weeks Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41443 --- sbin/devmatch/devmatch.8 | 7 ++++++- sbin/devmatch/devmatch.c | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sbin/devmatch/devmatch.8 b/sbin/devmatch/devmatch.8 index 14e2add65aa1..68705cd954ad 100644 --- a/sbin/devmatch/devmatch.8 +++ b/sbin/devmatch/devmatch.8 @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 3, 2022 +.Dd August 13, 2023 .Dt DEVMATCH 8 .Os .Sh NAME @@ -35,6 +35,7 @@ .Op Fl d | -dump .Op Oo Fl h | -hints Oc Ar file .Op Oo Fl p | -nomatch Oc Ar event +.Op Fl q | -quiet .Op Fl u | -unbound .Op Fl v | -verbose .Sh DESCRIPTION @@ -59,6 +60,10 @@ guessed from the current module load path. Parse and use a standard NOMATCH event from .Xr devd 8 for matching instead of searching the device tree. +.It Fl q Fl -quiet +Suppress some error messages and simply return a non-zero exit code. +This is helpful to avoid an endless list of warnings during bootup if +no hints are available. .It Fl u Fl -unbound Attempt to produce a list of those drivers with PNP info whose driver tables with that PNP info cannot be found. diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 20a57353ecf6..f9f5122663a1 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -48,6 +49,7 @@ static struct option longopts[] = { { "dump", no_argument, NULL, 'd' }, { "hints", required_argument, NULL, 'h' }, { "nomatch", required_argument, NULL, 'p' }, + { "quiet", no_argument, NULL, 'q' }, { "unbound", no_argument, NULL, 'u' }, { "verbose", no_argument, NULL, 'v' }, { NULL, 0, NULL, 0 } @@ -59,6 +61,7 @@ static int all_flag; static int dump_flag; static char *linker_hints; static char *nomatch_str; +static int quiet_flag; static int unbound_flag; static int verbose_flag; @@ -114,8 +117,12 @@ read_linker_hints(void) continue; break; } - if (q == NULL) - errx(1, "Can't read linker hints file."); + if (q == NULL) { + if (quiet_flag) + exit(EX_UNAVAILABLE); + else + errx(EX_UNAVAILABLE, "Can't read linker hints file."); + } } else { hints = read_hints(linker_hints, &len); if (hints == NULL) @@ -565,7 +572,7 @@ main(int argc, char **argv) { int ch; - while ((ch = getopt_long(argc, argv, "adh:p:uv", + while ((ch = getopt_long(argc, argv, "adh:p:quv", longopts, NULL)) != -1) { switch (ch) { case 'a': @@ -580,6 +587,9 @@ main(int argc, char **argv) case 'p': nomatch_str = optarg; break; + case 'q': + quiet_flag++; + break; case 'u': unbound_flag++; break;