From nobody Mon Jan 19 14:33:09 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 4dvtGt1S3nz6Ns7T for ; Mon, 19 Jan 2026 14:33: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dvtGs6BrTz3dtp for ; Mon, 19 Jan 2026 14:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768833189; 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=SDAj4/MBtMn3HJx0k+QzduBh5BBFcbvA2VuJQIwC6+s=; b=nua7y1mNhl8Bb1BEzf+lqelTq+ip3b2Hsaj0Gm12r7WMLHr2QeoOXWSjT7yvdGZ1SvUOYA z/HIBI4MY/YkDzcCyfCDD7WsovjhOfAVu2CouZ3wZ9ypVTDxKkRQhHVQyebUc+1cyhSbD/ gOtx7lojCVmJajD/M1Q2Jb9DzRKzkFisMUR583p14utJ023fuTH3SV23dAiW7dh4HToQ5v Ft6gVsXZUtdATb2aFcOnuX/uOQPpoQMcDyhVJSen4u5qzHNBPI3Ff7Y61eEx8m8TPOLb8K dM6KpCR1Mj8udylX1BukjupkkydZFOJoO1r87wu606BC3OwJD+Q876IZhsHxTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768833189; 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=SDAj4/MBtMn3HJx0k+QzduBh5BBFcbvA2VuJQIwC6+s=; b=v+01SbrhmzCUKfS+KBNNBR+C7fUaigtCoTxHcPtbU/970M5Zzi73zNE4ay0lfU3fi7bwHU 3C94KD551b4GYgIIWyPmVn6klU/MHaJKweNR9IPdFaYDUUek/DceHKJqZI8KYn9MFq8wD+ a0imOaqaaQXJF55W8dQpzG/tIaAr8WvuOjEtwGuzlCTO6RlrgLX9kq8eHRpHJqdF4m/PJc sdgMYpWAAi2P0WLVg4BxDYrV7SR4cyX99usZl5mL5KG7zAyS8+2U9J+ixKTjyMy6LOrEwe 1WmIOFBkYz00ZQcpVygBAhJOtbvoIoE+1DTYeUMEWunWNqStUNk1ZOaxKUTvAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768833189; a=rsa-sha256; cv=none; b=AfcgkF6oMThVdc2zeXVX6og589k8/EGWqMOy0IJAOIE5hY8hhaHJnLuCigpTFI8zABG8se nMLcbFdhaHYAKbB2AzhmSwDsTvOSOZcss96bogNgkPAqcLvH5MUP82VQ42ROmM/xaPYkNe ZlWq6lzbAnkoJurUMnLWJZhGDkih7J7dZ0h+GiEn34o4VVNkNSiEG1it1UY+3tKZJ9284Q JoDYjGWBmHHYvpf19Aqy+IUuWR/wdAF2o2y2qv+bTUGl1xueVC8fgRs0YUov5zV2zDfAZS 6sxokrp+P/S6mm6AX07qbtF6jAPDHxLCHWAqIob70DN7BjQcYyG9P50C7gUlAg== 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 4dvtGs5pKRzc5F for ; Mon, 19 Jan 2026 14:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2106b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 14:33:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 99afbc5cc7ae - main - 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 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/main X-Git-Reftype: branch X-Git-Commit: 99afbc5cc7ae8ba7b112fbafbf24ea2575a65ba4 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 14:33:09 +0000 Message-Id: <696e40a5.2106b.55f274bf@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=99afbc5cc7ae8ba7b112fbafbf24ea2575a65ba4 commit 99afbc5cc7ae8ba7b112fbafbf24ea2575a65ba4 Author: Mark Johnston AuthorDate: 2026-01-19 14:29:33 +0000 Commit: Mark Johnston CommitDate: 2026-01-19 14:29:33 +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 --- 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 a5322f05d28f..fa51dc950459 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -1228,9 +1228,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: