From nobody Fri Sep 18 18:58:26 2026 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 4hmhjN1G02z6sr7B for ; Fri, 18 Sep 2026 18:58:32 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hmhjM6cfRz4YfX for ; Fri, 18 Sep 2026 18:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789757911; 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=xCBlEPdDp+ffJa6C7UtJ07EHdGW4x4yQ0/+/NEHArBQ=; b=f70neTXlry0FQ5KnX5WxS5F8ohK9lETPB1qatNPJTYzmm6F7yu+AWuMfvXa8ArKE2oPzzG jQ0FfzcG4JvFC7hA004oSNT4EkVyz4JWITM/PBiZHNInGnxjj/I3gNJWrQvXBcuXIki5pZ 3kQGuzmOevNdQaIOzfoFqOalnBt/gMXSkMsh4VoTHXHkjv8/BLmuszdsHF7l6+UB7G3lsK 2qbcrlg3YKYblmiIaEOrsm8/MY4ngX8V60tZqKgH1PeUc6gsieRD3pz6LlbDfYWWQD3Ui2 KgIsdufs3/VqjQLZMSJsQwrbtelreQLoqQeWt15N4mMAwk/Y83iUOM5pdlP+lA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789757911; b=SorwyGkG6ZVwx+YHY131mnaRX3UunCoe3MwgQdy3AAmOmbDcmjFT1BLv25swL7w8HOqRHF UMISg4x0+26mi+7+cPyL07JjO3f75I0tEeA2AQHvCnlnUSQ47GiZdtzL7JW0exiWwiyCz3 WVTXY/wiJbJXyyUuwj/7Oe77t82yXFdfz60Y+ITIzR3OmLJpX3akiUPdhWTm5fnRtIP/aD 4E5BJ0tRTR9Lb2j9f2NOBoIx6UM7IIIe2c1wwVnSlP9fBZ+fUV6NV/mjnXZzlXiSSjIpa1 0yHUlz9qskgk/S2RMB7HnZJ0ayKhKJzg/RpEz8087anvoURR0UTPRGde9mVfnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789757911; 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=xCBlEPdDp+ffJa6C7UtJ07EHdGW4x4yQ0/+/NEHArBQ=; b=QKnIYY/ieJgLPTxXJ18aCjOTHTjZNXwC0pDeF4+aELFEwvWqZDZCPPjF8kH0WGz7lhfvOO rWLqKrWTmefqe5mgd7OEUvzstcRxfok4ziZCLzuR6wcztpJH7y8LAq8MqbIef6dMN35sjS 07ZBXAURiAMcu2X6+yyapyOpDGhPlNicXCnIP3t625iE/qb44t6dYWdegVuK1WY/nC4DEB WHjmyswzTOFtW90MwcRimi0Q9QQ60NKSfwSKvc4e8Hi1IDwSeJdmLRJ2Z4MHFOEevve5L9 yLkTZXOHcK47SfRZuqsdSSlG5Q3HZBfNwxQ3p2kmdFw/zyUlBMfhIG+1W8pr8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hmhjM5DsPzWl7 for ; Fri, 18 Sep 2026 18:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 398c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 18:58:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 17af098383ba - main - Revert "virtual_oss(8): Fix cuse.ko check" 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17af098383ba18497610c77239a406c2f9bd02b1 Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 18:58:26 +0000 Message-Id: <6aad89d2.398c1.4752ae4@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=17af098383ba18497610c77239a406c2f9bd02b1 commit 17af098383ba18497610c77239a406c2f9bd02b1 Author: Christos Margiolis AuthorDate: 2026-09-18 18:56:59 +0000 Commit: Christos Margiolis CommitDate: 2026-09-18 18:56:59 +0000 Revert "virtual_oss(8): Fix cuse.ko check" parse_options() was moved above cuse_init(), which makes every single regular virtual_oss invocation which uses cuse_dev_create() fail. This reverts commit f014795ec3bd5efb88dfc249599e9665dc10a59e. --- usr.sbin/virtual_oss/virtual_oss/main.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index 41658d0af325..1b03e2c8cf37 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -2564,7 +2564,6 @@ int main(int argc, char **argv) { const char *ptrerr; - const char *cuse_mod = "cuse.ko"; struct sigaction sa; struct cuse_dev *pdev = NULL; struct virtual_profile *pvp; @@ -2584,17 +2583,9 @@ main(int argc, char **argv) atomic_init(); - ptrerr = parse_options(argc, argv, 1); - if (ptrerr != NULL) - errx(EX_USAGE, "%s", ptrerr); - - if (kldfind(cuse_mod) < 0 && errno == ENOENT) { - /* module is not loaded */ - if (kldload(cuse_mod) < 0 && errno != EEXIST) - err(1, "Failed to load cuse kernel module"); - } + if (kldload("cuse.ko") < 0 && errno != EEXIST) + err(1, "Failed to load cuse kernel module"); - /* cuse is loaded, initialize it */ if (cuse_init() != 0) errx(EX_USAGE, "Could not connect to cuse module"); @@ -2608,6 +2599,9 @@ main(int argc, char **argv) if (sigaction(SIGTERM, &sa, NULL) < 0) err(1, "sigaction(SIGTERM)"); + ptrerr = parse_options(argc, argv, 1); + if (ptrerr != NULL) + errx(EX_USAGE, "%s", ptrerr); if (voss_dsp_rx_device[0] == 0 || voss_dsp_tx_device[0] == 0) errx(EX_USAGE, "Missing -f argument");