From nobody Wed Sep 04 00:50:29 2024 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 4Wz3nK4LD5z5Mnfk; Wed, 04 Sep 2024 00:50:29 +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 4Wz3nK34dxz4Xf6; Wed, 4 Sep 2024 00:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725411029; 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=opAJ3rmIaP4jncYh9LlRwH56DAHVENwRry+k3P11AC8=; b=xV9WYAk6s9fxyQrn7QWzGqh7acqccmm68OvMo+/OedX4qfT1VsaH74Qukz+wymSg+lZUtt cA50N3AB7E+KRKAfYAlgUVP4gXCLwPzTVG/RAqUPhVxhp+sZtVe8gFZT/1ALBaXaWt2DQ9 VEI3CCm+ldVhY4HZqAYatKfrAUam2PG52+3PTOE1x0Gl6rM+/nNUB5XNU8pe2asCkNwuLm DyGzKsztrWGTVYWg6WNmMw5+ZUnDdIY7JbJ0Xa9pDwfP6QcnSuRlygOK/VUQZK9gRiuueJ nLsajdkLS41j4GHtcs/6Bjxjorq2mwKG/8msM0uOkmY3RPbCCviMB40BDnHBMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725411029; a=rsa-sha256; cv=none; b=b2SX8C/6ga0DhAaR0eQPgDKY/xOusaZ4TBJb4Kd9YKpCb1Z0VgNN8mTY0TnmTiMIdoUNJ1 fQYOt+pbHrWXh79c7saDCNnw9YEMo4RZZmDuhEEDmXz5Hq7bXaUzzEUE75E7QEigM8sarx flrFWPf52YdS3XpPY1VeEZEZoi51mdUpvR6GK9XSlE1faQz8TyS9xNQWfQRR44nL8tGlx5 ff4ycpf2IfLhL6lG1IJoqWgDzrZ/T9WiWNOn9kfXt0/F5CUvKE4vsZWT8Os2X3tv6w0eIC X/NnykScFEatAda95gWlmqYag1AXu7YS6HGM3ENpUytQBieDOkLOhWlKnIqSEw== 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=1725411029; 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=opAJ3rmIaP4jncYh9LlRwH56DAHVENwRry+k3P11AC8=; b=QZQ6CZs3IwN0yaU2Ay3/vRdfkFjk66n/J9smdRdH77eytGiIYGUJGLd1j0wl/8nb9YWkvi qlvOCcId7XIFxg0m2hRkiyNCrqgMNANwQUCbQJw0RFtpX/b8v0F/yZpLpT6g7IMBQ/EvS4 FmBHRQaBGyF1NV5F59ZKL4NaPxt5dAqqmYCvIsqqPulJFWg+pWwPmAflhwJsbzk7iIN9xj aTG6iBaBXZIuDIkhbvmiTBcV16xtYCbZs64FYcNO0LpIDls4GlaUYFwcRN4UnM90865rtJ DSu+rbhIkkqsU/7tiHnl6+cIxybcMnBq/OFC6xAEOOJ5hr39WwqTPNziMHgs8Q== 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 4Wz3nK2fy0z12j1; Wed, 4 Sep 2024 00:50:29 +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 4840oTrK081767; Wed, 4 Sep 2024 00:50:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4840oTXl081764; Wed, 4 Sep 2024 00:50:29 GMT (envelope-from git) Date: Wed, 4 Sep 2024 00:50:29 GMT Message-Id: <202409040050.4840oTXl081764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 34f40baca641 - stable/14 - x86: Detect NVMM hypervisor 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 34f40baca6413a85e2531d21a616f1b2042c08cd Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=34f40baca6413a85e2531d21a616f1b2042c08cd commit 34f40baca6413a85e2531d21a616f1b2042c08cd Author: Kevin Bowling AuthorDate: 2024-08-28 09:31:35 +0000 Commit: Kevin Bowling CommitDate: 2024-09-04 00:46:48 +0000 x86: Detect NVMM hypervisor (cherry picked from commit f622dc5daecc5c05504cfc605b6f2d66a3bd90e8) --- sys/kern/subr_param.c | 1 + sys/sys/systm.h | 2 +- sys/x86/x86/identcpu.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index b7dbf606f492..c0a4ac747d00 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -158,6 +158,7 @@ static const char *const vm_guest_sysctl_names[] = { [VM_GUEST_BHYVE] = "bhyve", [VM_GUEST_VBOX] = "vbox", [VM_GUEST_PARALLELS] = "parallels", + [VM_GUEST_NVMM] = "nvmm", [VM_LAST] = NULL }; CTASSERT(nitems(vm_guest_sysctl_names) - 1 == VM_LAST); diff --git a/sys/sys/systm.h b/sys/sys/systm.h index eb690b1cf4b4..581b981ef9e0 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -81,7 +81,7 @@ extern u_long maxphys; /* max raw I/O transfer size */ */ enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV, VM_GUEST_VMWARE, VM_GUEST_KVM, VM_GUEST_BHYVE, VM_GUEST_VBOX, - VM_GUEST_PARALLELS, VM_LAST }; + VM_GUEST_PARALLELS, VM_GUEST_NVMM, VM_LAST }; #endif /* KERNEL */ diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 7df20053a9d1..36056b85101b 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -1361,6 +1361,7 @@ static struct { { "KVMKVMKVM", VM_GUEST_KVM }, /* KVM */ { "bhyve bhyve ", VM_GUEST_BHYVE }, /* bhyve */ { "VBoxVBoxVBox", VM_GUEST_VBOX }, /* VirtualBox */ + { "___ NVMM ___", VM_GUEST_NVMM }, /* NVMM */ }; static void