From nobody Thu Mar 17 11:57:04 2022 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 12D6A1A1CB9E; Thu, 17 Mar 2022 11:57:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KK5Gm73nHz4lpQ; Thu, 17 Mar 2022 11:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647518225; 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=+bHoNMBckeUpTs3BCaRRVaAViKgga38At/IfT6cmG7g=; b=HBskwpD+KLH8IYxD4LcBuytB9/7Vt3RTB4IfXAcAx952UmR9ig6BmNdmKmtSGfT+hRfzqj s3Qvg4Q9bCTT7RVmLgDbJjCdw70S3zRXBQ8sXobEnul0emFVO1w1Bq5oKS49h7U6pEomog Gdb6zLJauMxS45V3XfAk2H2MPNSTCpfiaOCnucWg0hEl8htV5nJIYXxCBfcbIcExrlvfF8 +XLyDlXTzHkvwDc4T39AleZcVlfkti0QK0RcAOf9noxrBwQevYr7Qk2fyYGZNcVfuek5mv 2PKvAFUO45XNiPR//DYiK9tHkX+McRkYvqu7g2seyDc6xk3vbblOAFL5/2HfNA== 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 C9BE11CEF; Thu, 17 Mar 2022 11:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22HBv4Pt042730; Thu, 17 Mar 2022 11:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HBv4S9042729; Thu, 17 Mar 2022 11:57:04 GMT (envelope-from git) Date: Thu, 17 Mar 2022 11:57:04 GMT Message-Id: <202203171157.22HBv4S9042729@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger Pau Monn=C3=A9?= Subject: git: 396a8479b0ac - main - x86/xen: fix CPUID signature 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 396a8479b0ac310801e998bb1c3dcc6ba4839454 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647518225; 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=+bHoNMBckeUpTs3BCaRRVaAViKgga38At/IfT6cmG7g=; b=JBskpOkjyP6DgXIMEansmbno4Nv+vQEFwwe2s+t08Xns5Ze/MwIWmX+UytI6RJBQN3CIBF pT5EQDRpWCHWY5eJGGbObxfQHgcV1nxpgbbU5sePkumQ7eQl+cnM/OkmmbqV6HasDEKAAE SVomivWzF5XWHjlO2Sl1yBWbTLrArUpXo11DkV/Irvj9C61cgUW4BEv/QedH6GpLavjDd2 6CAXrmcudueGB55NuNV+yhcb3/qeiRBmPtGTMDBteIbesQkBk8+k7zTTi8L9dFXCqsBDCh Imve12/kITX9NEROXpvJzcAX0FHyimEvIBgpVF1VVwHDTbgYJV0s7vtX3AtuuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647518225; a=rsa-sha256; cv=none; b=xqjkVOOHLdfRIeMD65UffFtEgFeS3F+/b2fjEgtzLkC+R7rgE6n9Ae+YN2MEjnJ1JyvDaI GAiK2K99jeAkm7kRU1QSg6ouFjBQ00SFSNWMD0uH1/2y/Y3tYKivL6CszbhjLAGV+eiNM3 ZSMyVQjx7Sa3CwTfhs6OQNdkow03u8SDxj/sNOQfX9g0rpz7NfiVzYUqdTcCmyMgi4D5bs p+PU6H6/tYgLV9m+oPYYfg9fUQI/9+lQU5OGm/I0OxYsn81edGNP1Axs9WPIfnMfm/GvWV XR0FD93u/5EIja4VZG1QbBQA+HHfLuyNy3w/ZbhcUrXiGv/49bsODjgqOct/YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=396a8479b0ac310801e998bb1c3dcc6ba4839454 commit 396a8479b0ac310801e998bb1c3dcc6ba4839454 Author: Roger Pau Monné AuthorDate: 2022-03-16 09:20:51 +0000 Commit: Roger Pau Monné CommitDate: 2022-03-17 11:56:36 +0000 x86/xen: fix CPUID signature MFC: 3 days Reviewed by: cem Sponsored by: Citrix Systems R&D Differential revision: https://reviews.freebsd.org/D34580 --- sys/x86/x86/identcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 849f532dbf8b..cf75d00683f1 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -1374,7 +1374,7 @@ static struct { const char *vm_cpuid; int vm_guest; } vm_cpuids[] = { - { "XENXENXEN", VM_GUEST_XEN }, /* XEN */ + { "XenVMMXenVMM", VM_GUEST_XEN }, /* XEN */ { "Microsoft Hv", VM_GUEST_HV }, /* Microsoft Hyper-V */ { "VMwareVMware", VM_GUEST_VMWARE }, /* VMware VM */ { "KVMKVMKVM", VM_GUEST_KVM }, /* KVM */