From nobody Thu Jun 25 17:24:54 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 4gmQfZ458Wz6j3M2 for ; Thu, 25 Jun 2026 17:24:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmQfZ1RWRz3JKY for ; Thu, 25 Jun 2026 17:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408294; 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=1KsLLjcRGvFVBq2Tc3v6sqO6CSraDPLQVvCJvMHYK2Y=; b=vkf79vRkTFSTevJWItvAU0AcxW0YRAa1+/mdTyPGdnfZfCnrPiq3l2Qv5Ppjvfj4Me0oVb OQK01dv0R5IX8vIuQeqv+lUyjzgodOPFsTktajLNYFmyDe6XEhGmq3YO921l9M2NA1+DaY YhhvDBMP/aVyUn5HlDeLVyP3RLgMUYi8SPYhcXstvHK56ZogXVDHr2at3ZEVrXZa/Rnm4R U/h8lrgeApuvHwECiJ9JrKQA/kfBsiJPFLSgs2JFzMW6M2nugtsJ24Xfl/FuWQMJgmh3Ju jBZ15K/HZYcjcSdzC3gUzRqNRDRp92yRW+67wEuKC3og5Jt+lk7ddwMsvrqwMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782408294; a=rsa-sha256; cv=none; b=O0X3fvrl1GhDE+1MEEakydo3ohI09f7SQRFcaCAlyTsy05e57FMXm0C0nF/LJbZ/fNnCC4 +Y5KBQH3FUrkoygBAWKUUJ0kR1wJ+72wI6j8AZRQFZxhWDTS6j03Z9wxzep2nich3oQFUc KVa7THGnAhnsgzSLleq0we6Q7x4fKbci0Bn/VPQGFlLbjN2EGn7apqYGFU7RJwHWVmKQO5 y34UjBgxmttle/sPZn7yyr+E9GMh4w/Hpm4RvWz7+6uUrK2m4CoQr6WfAJcfItRZ7RUfTr 2i7C8AMeM/DG+K0E1VVAvhTFOiUe5JDRiTMQhF76+gx8mM9/athFUTUk7juSiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408294; 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=1KsLLjcRGvFVBq2Tc3v6sqO6CSraDPLQVvCJvMHYK2Y=; b=ZZJEeQmb8Hx0cZZJHYd3YQDhEfZ7KZI73jwuuJ97wlV8pW7zu5S5wJ0/x6H6h9mRvV8rFY 2yvPmnnpi+Lm5KS0LZkTKCHN5wK3wOdcBNf3+aNyKnGuK97ve76czndDFT/XSgK+AR9S1a n+iAYzvh2bL1C+/vluqwDil8abluyDErN6gcUoeapoxL015VLXJEruG3OQDqCUgx1xDwag DIPuGo5tdtDZZRB+nJ+eEAWdwxZzCbSSqPiRj0sBZl5XFrmEMquGnepS4rOEYhU8O6QQQc XxdK97wEOFrjdtTWkdy80VYGNyUnRD9tTaZzt248N8arA/Wf8BhrzKNyXWhEsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmQfZ0HkNz1FhQ for ; Thu, 25 Jun 2026 17:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34a60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 17:24:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: eeff383ba634 - stable/15 - vmm: Avoid clobbering errors from vmm_modinit() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: eeff383ba634e2496f67949254a2a8432c8f0582 Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 17:24:54 +0000 Message-Id: <6a3d6466.34a60.4d6dfc92@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eeff383ba634e2496f67949254a2a8432c8f0582 commit eeff383ba634e2496f67949254a2a8432c8f0582 Author: Mark Johnston AuthorDate: 2026-01-19 14:29:33 +0000 Commit: Mark Johnston CommitDate: 2026-06-25 15:33:48 +0000 vmm: Avoid clobbering errors from vmm_modinit() Reported by: novel Reviewed by: bnovkov Fixes: e758074458df ("vmm: Move the module load handler to vmm_dev.c") Differential Revision: https://reviews.freebsd.org/D54750 (cherry picked from commit 99afbc5cc7ae8ba7b112fbafbf24ea2575a65ba4) --- sys/dev/vmm/vmm_dev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 625a6dce9465..302a73be25b8 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -1151,9 +1151,11 @@ vmm_handler(module_t mod, int what, void *arg) if (error == 0) vmm_initialized = true; else { - error = vmmdev_cleanup(); - KASSERT(error == 0, - ("%s: vmmdev_cleanup failed: %d", __func__, error)); + int error1 __diagused; + + error1 = vmmdev_cleanup(); + KASSERT(error1 == 0, + ("%s: vmmdev_cleanup failed: %d", __func__, error1)); } break; case MOD_UNLOAD: