From nobody Sat Feb 08 16:05:47 2025 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 4Yqwfz4gH3z5mVxj; Sat, 08 Feb 2025 16:05:47 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yqwfz3rRKz3nMM; Sat, 08 Feb 2025 16:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739030747; 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=47dQPcC2yuTX9e0PhzyGUcwB9+MY7u7EB6FkiXcpje0=; b=fB0oTpTg1z9548qcMvYmz1o+H0W8b5yuqeP3c8q/232Cf7577Zy0awARvb4UuryOtZ7w8q mCLwPsn/q9jVE2A0yDG/payuRDtjMpuljZ2HKs/ZyOYjEd/Qg9ZMMU0PjklFaF17JhHmY6 A/X0OyPNHwa/QQzoscoIxiExV892DFLsBWYuN7iDIevqGk4SE5GqnORXNzGLDrOn5vmurw MsCm37ZYpHr1bLeeTKsSiyPIJvxOK5PpIUZ0M9l0xdXTmCOL/MOAT9lLGcZOs6LeyWHQOS 195auN8pg18dS9a7K3tCDKgPrbKKf6cDdKakERaTQuLKY3WPAHAmzsWTtq55ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739030747; 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=47dQPcC2yuTX9e0PhzyGUcwB9+MY7u7EB6FkiXcpje0=; b=RokUX32rPVlcp8sPlR1e1QfCqt1ZdnqOJ12//lvq1DvK19IFQ74qg4vFIC/WLwgdjWbfvX wT0XuqUcw/5+3hKKWJiEQRi3VqEkfanrb9sXPAIhn2+4dFQqn7aRsOViYhL9FXvZa/Ph94 OMWLSHm2SkLNq0PEZBPwbIWEiOtN7cNTnkEBNs1zumVRNICZV1umtmjrsvbIZj0okjn4hp rX/mxQf9lMYtbiBH6i6f8LdovgRcM9UTwiWQ9CXcVeYdscoCBdzRdj5/3CMzzoliKi1+Mv iZAF2ShPThz2lFj0VGiXwHT/0jyPMVbwTayz1YAK6n0F5aRrdsmF2LKmZOMO0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739030747; a=rsa-sha256; cv=none; b=P0Kdx85Ue+iU89wZZy5+JC8CgEW7t7065Q6Q0naCh6ngtPkSSMR1U+ZQW7TlGTZsYmrGn2 cBmyr2BlhiYTwqGs+U/Mt1/mB/CPs7eCq4pSR8PXn7sZQBuID+qj14cUuvhrjFjuD5idAM srzbUR/BDGcRduqggrbcs/zZFbxqk4RCmUn11a0C0msrcWlQUj5QDp/qkiDOSekB8zsegY WWpFs0u38VcttEu7uz8Z8FgU2xttMei4Au9sdCL9Z1BGSjnqIIkSI7pPU80CQYfztKaYMY 9UPedfldWrJW02F0uBoEImp0Fp8pNa4qOusuwl9sHLYXD7G8GiLvphNSX8HfDA== 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 4Yqwfz3HNYz30k; Sat, 08 Feb 2025 16:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 518G5lrj062620; Sat, 8 Feb 2025 16:05:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 518G5lLs062618; Sat, 8 Feb 2025 16:05:47 GMT (envelope-from git) Date: Sat, 8 Feb 2025 16:05:47 GMT Message-Id: <202502081605.518G5lLs062618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c2de0116c801 - main - vmm tests: Check for /dev/vmmctl to decide if vmm is initialized 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: c2de0116c80176829406289da3b79b6e70855ea4 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c2de0116c80176829406289da3b79b6e70855ea4 commit c2de0116c80176829406289da3b79b6e70855ea4 Author: Mark Johnston AuthorDate: 2025-02-08 15:01:43 +0000 Commit: Mark Johnston CommitDate: 2025-02-08 16:05:37 +0000 vmm tests: Check for /dev/vmmctl to decide if vmm is initialized If vmm.ko is loaded but fails initialization, it doesn't get automatically unloaded, so the tests will not skip themselves and will instead fail outright. MFC after: 1 week --- tests/sys/vmm/vmm_cred_jail.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sys/vmm/vmm_cred_jail.sh b/tests/sys/vmm/vmm_cred_jail.sh index 4ead7fdd897d..5b02b5dc0b42 100644 --- a/tests/sys/vmm/vmm_cred_jail.sh +++ b/tests/sys/vmm/vmm_cred_jail.sh @@ -38,7 +38,7 @@ vmm_cred_jail_host_head() } vmm_cred_jail_host_body() { - if ! kldstat -qn vmm; then + if ! -c /dev/vmmctl; then atf_skip "vmm is not loaded" fi bhyvectl --vm=testvm --create @@ -59,7 +59,7 @@ vmm_cred_jail_other_head() } vmm_cred_jail_other_body() { - if ! kldstat -qn vmm; then + if ! -c /dev/vmmctl; then atf_skip "vmm is not loaded" fi vmm_mkjail myjail1