From nobody Wed Aug 28 20:39:38 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 4WvGVf3TKDz5Mj1W; Wed, 28 Aug 2024 20:39:38 +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 4WvGVf30Qkz41Qq; Wed, 28 Aug 2024 20:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724877578; 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=CmVvy4SCeRxKdldD0uO8fQmVPmjHfLNfbNiUq4Y1aVw=; b=fFC3PrPPxRgYu7N7bWzXyFi6pGN747ePJVNeAw16C3fqu+RfoU26jkSLjUeP680XYe/7md jty+V2VHCDv8sBkUZ5cedpOgFgnnZVfQX6pzLkB1DVvmPYJa37xUL0FF/rgA1qUbO6shWj qCFTmodZi/0crmUzVnjRR6O2a+1B/hoobi/AU8r5axKzlAzuja98jiyraSPuBNE5Ztfdxh 5QXN9I3b4NeS0m71i8zMkVTIJDJBaAyXsgpeu+Ctem7FWdaaQRH3+eFvCUaU8/1oAnofTL J2GWa/Q/C1X0Ncdb15GxpLgb5JAgEPE+u/JHOZ8ME9eKMyVBFjzmjchA14gv6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724877578; a=rsa-sha256; cv=none; b=SJff5UjHDGcv3TWni07XXEoy4k2TfKhcf1kTouNzwhPv+fDe1N8LlabzrI9xTHnqitIYUT 8lnyrFjribJWKJZIsvpfm2P+b2m54Hd5cMEVzJMlB+ogaGIBOziKP7Ww07FqjApfIc+OfH /gfhx51hjIdUEqk013/EUpocLIWW7nqXqQ/a1lWPuExdWQnrmvEI2D3sTtbZhMVkIP2lN5 2uRKsMtvaKHh3NfK2rONCUBtBx9gP0GrhPOcbyMiBU1Ijlor62ds8TG+WCtaU91uEnxRGr a9Q8zmghW/T5oTy20FwVOa/RFv6zJ4HanpVN/Fy510ESxOCsOaiolPSITDlArQ== 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=1724877578; 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=CmVvy4SCeRxKdldD0uO8fQmVPmjHfLNfbNiUq4Y1aVw=; b=h1kjrqxNiqoUizjxyTom8an87NvQjjcu2tkdUq8RFXnSL9KmMQ29yM3upPhcAUAvmBkPtS Zk3nUFPk28VZMuNyiVlEJ5DHNNSg0Z+MfEKqtTm/LqqKEeuyHP+YnNnqJAxTzQN6wzuwGc AEH7nqc+WcqHuam37sTyLWUWVjS1PbMUisj+16fGv7UUI/qBAJ7l6BvSWe/6RPy/gAoxTp JGSQZDGs9/ZyD5g+2gL0c+qRLVcMDFfIcIf0ozjR7BdzIrlVYDKr0Efw0Li9nntM9s4dOb CTieAO4DUuKc2dMEvhWa5YsRycnC0RMy385z4I3aiUon3F2LfRSqWKMncBM8pA== 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 4WvGVf2c8WzpY4; Wed, 28 Aug 2024 20:39:38 +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 47SKdcmx095719; Wed, 28 Aug 2024 20:39:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47SKdcjS095716; Wed, 28 Aug 2024 20:39:38 GMT (envelope-from git) Date: Wed, 28 Aug 2024 20:39:38 GMT Message-Id: <202408282039.47SKdcjS095716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: f622dc5daecc - main - 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/main X-Git-Reftype: branch X-Git-Commit: f622dc5daecc5c05504cfc605b6f2d66a3bd90e8 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f622dc5daecc5c05504cfc605b6f2d66a3bd90e8 commit f622dc5daecc5c05504cfc605b6f2d66a3bd90e8 Author: Kevin Bowling AuthorDate: 2024-08-28 09:31:35 +0000 Commit: Kevin Bowling CommitDate: 2024-08-28 20:39:07 +0000 x86: Detect NVMM hypervisor MFC after: 1 week --- 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 ea5e8d02be2b..7d58208a461f 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -157,6 +157,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", }; _Static_assert(nitems(vm_guest_sysctl_names) == VM_GUEST_LAST, "new vm guest type not added to vm_guest_sysctl_names"); diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 6c2b466c4cfe..61874a05e0b9 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -79,7 +79,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_GUEST_LAST }; + VM_GUEST_PARALLELS, VM_GUEST_NVMM, VM_GUEST_LAST }; #endif /* KERNEL */ diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 4da250c535a0..f24fdc1647e6 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -1370,6 +1370,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