From nobody Thu Feb 24 05:26:48 2022 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 E1CF319D1D0B; Thu, 24 Feb 2022 05:26:48 +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 4K41c83t5lz4jBV; Thu, 24 Feb 2022 05:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645680408; 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=waEskr9E+N0YRiPba4oW2SMaFC7zelfN7AaE0VPXaLo=; b=q+/i8P9VemV4BUuTyGqiTTeC49hpLERsHPyNj5OrU5xufNjiYCEo1Z37dbD6gSqIrMq/qL hnXjLWkLlzhxyGt8ovcYFPhUAv7quCriymmt+CH0RnG0/H+5nIJf4oPNw8AXQ6jvp5Oo0R lFUfRtH9ejdY2BLz7gW4J/iSoDDCHda76DUWPUa82TJ59q5FfB4QU5/gX9Qpm+ZWO2XbqW UR7MUJR6dYmRAdOv5jwNTNObzk2d5xxunGok1EqtnY8KUP/ueQjZq0DbMtvCQyFUtWFRWO CDLcWnv1aKtCflq4/E+1U9kJWpce7r//kp2/AXY+6LO/FJzqrlKcn6TCmp9OcA== 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 66CB425FE0; Thu, 24 Feb 2022 05:26:48 +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 21O5QmMC027657; Thu, 24 Feb 2022 05:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21O5QmCD027656; Thu, 24 Feb 2022 05:26:48 GMT (envelope-from git) Date: Thu, 24 Feb 2022 05:26:48 GMT Message-Id: <202202240526.21O5QmCD027656@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: e6925175174b - main - Handle MODULE_VERBOSE_TWIDDLE in module_verbose_set 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6925175174b1a7d7b5aef035ec684b2d5f628b9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645680408; 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=waEskr9E+N0YRiPba4oW2SMaFC7zelfN7AaE0VPXaLo=; b=TNMHeYsteL4R26PNm8LFNijb8weaEXEYLPc04nBP/M2A5aOBPlxNSiEX2SuQXCRVcuCsA1 DUd50bBqnE6Xeko1lpOyHDzFHjGu7L03qYURtW8fTcn8QPNabJ2zSAupzpTJJyu6ZTDbZz viL4PyLm1iVkE0pKCKQ6rlzVNrwtQpb+jLY+/qT6Dnzkwv0UUgXX8sEXx3qi4oefrsg1IH wLjZhVKUB2lpjqlhVKKaZ426AJ5DVv4kzN8+PXnCUNyYJsTtweJw+LMqDq5sa2wfbHq24o gYilDMwO7SS4xJJW3D/PCSbW8kyW8t8EMcIR8UlojmY9crR5bgjNgwdLEal0iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645680408; a=rsa-sha256; cv=none; b=sGPErVRbsqHJGbcbcnSeE5xoYBiPgjTUnHZWh+cv6d2KaF3xp3F2Z7r99hUCa+dbPgeoAe mG03hLgCRtEjO1+63lER057x3LjeRHx5yk7zAO0Gcy+J0Zv3PT6PEi8acs8QpOCFwnw1yp HFKEAQiv6zyDmhpE92AMnklQ8x1FGx58kcQMZmzWkLPf++B6ZNb4sGqVqO258r0eGJffvZ Qbkn94PFxw2n7913uC/582tBSaA0/sIO8mHXDpEDuuhvmZXkuj68hc+Hpv9W+UzGF5O5mS oIfI17ML6fYUWW6KnjxB5pPca8UgJRbg+x4cbatGbnXX4MRWUOC8aJQnnvaFag== 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=e6925175174b1a7d7b5aef035ec684b2d5f628b9 commit e6925175174b1a7d7b5aef035ec684b2d5f628b9 Author: Simon J. Gerraty AuthorDate: 2022-02-24 05:26:41 +0000 Commit: Simon J. Gerraty CommitDate: 2022-02-24 05:26:41 +0000 Handle MODULE_VERBOSE_TWIDDLE in module_verbose_set If module_verbose is set to a value below MODULE_VERBOSE_TWIDDLE call twiddle_divisor(UINT_MAX). This makes more sense here than when we are loading the kernel. Sponsored by: Juniper Networks, Inc. --- stand/common/console.c | 5 +++++ stand/common/load_elf.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stand/common/console.c b/stand/common/console.c index 08d0dc40e3a9..0e8afb477ee8 100644 --- a/stand/common/console.c +++ b/stand/common/console.c @@ -27,6 +27,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include @@ -58,6 +59,10 @@ module_verbose_set(struct env_var *ev, int flags, const void *value) return (CMD_ERROR); } module_verbose = (int)v; + if (module_verbose < MODULE_VERBOSE_TWIDDLE) { + /* A hack for now; we do not want twiddling */ + twiddle_divisor(UINT_MAX); + } env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); return (CMD_OK); diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c index 62df96aa2ebc..4a6c1d5f4e7f 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -470,11 +470,6 @@ __elfN(loadfile_raw)(char *filename, uint64_t dest, } else if (module_verbose > MODULE_VERBOSE_SILENT) printf("%s ", filename); - if (module_verbose < MODULE_VERBOSE_TWIDDLE) { - /* A hack for now; we do not want twiddling */ - twiddle_divisor(UINT_MAX); - } - fp->f_size = __elfN(loadimage)(fp, &ef, dest); if (fp->f_size == 0 || fp->f_addr == 0) goto ioerr;