From nobody Wed Mar 23 13:46:56 2022 X-Original-To: dev-commits-src-branches@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 E35951A2D5A8; Wed, 23 Mar 2022 13:46:56 +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 4KNqQm63tZz4X7j; Wed, 23 Mar 2022 13:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648043216; 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=In6B4ZqhHDBuksJLEZZMpkBBji65PeFXtChYSN2z/UQ=; b=csWltGGcvCslZXHYaUqHjYKDvnEbpooK5B2KUMocfUsJDrXyo6EWDxXQ6FmvE5Qfezq+Nj q5SUfpfR3RiyBheg4OvIWqPOQbehjmNDvvGpJbppeV9+/tGNYP5FINNVgKS1/wgU/Ii+EM wXK6K3KGsHmkoUAiX7EMLbaDGPt25PI1w1mYMqRYfV8VoxkmJQFHFjjZPmE04ayQosfOMh wwfZ+NYtzz6x08UwkSgMazCBJ7/KezGMTj2RlGI79mokJIpjIiLrhgSz1h0/an+Sk96bhr z0LYAOVOmDqf+Dvp4WmmOgovcN3Iy/HEcC6BcTrueo5Uf6zzmJtnqz5J3iqwKA== 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 AC074248D9; Wed, 23 Mar 2022 13:46:56 +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 22NDkug7020050; Wed, 23 Mar 2022 13:46:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NDku0M020049; Wed, 23 Mar 2022 13:46:56 GMT (envelope-from git) Date: Wed, 23 Mar 2022 13:46:56 GMT Message-Id: <202203231346.22NDku0M020049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Roger Pau Monn=C3=A9?= Subject: git: 88aff320c805 - stable/13 - x86/xen: fix CPUID signature List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 88aff320c8058eec9b5c4f73bdbdb861e29da47a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648043216; 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=In6B4ZqhHDBuksJLEZZMpkBBji65PeFXtChYSN2z/UQ=; b=v6goXUFz3Qe62svIdf06MdpEyLBtoKA6OK2//O/fzsQgyY70ovJYYNMbCQ5SqKVhlMqUtw J62jWe++zZuHvKPWdPqbFDRezxteNUruOWaJSrAOO4l16cJFwMqGNqUQPbjgHED1TN+/62 63abIuBpGf+Hav+kmydjqDKRiD2dLx/IcLie8W7rYsj5bmXJYc/UnQVzLzmzqyMPIENqyw uxBED8Iyrb65DelGLJA+OPHwlkv/NcXTPib4soSF+8aP4nBCL+kQNJTeL4IE3gFpISAw1v gES7wXVGPAz3eaRBNfYRrRz6xTOzQ6FNXgGkGdZXdFBW6hF5zEs5kuCQ47zLYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648043216; a=rsa-sha256; cv=none; b=eWIIVUwF28tormxV2BgXw5+wi6UXtcu1UnNpeKUGbrxJYwPXFb+dNkONtXxPbuBe/beVQ7 fvH0ovddPdj6JZjUvMq9IO93SnI4jvQwKPSe0HzesWO7VjEqkHhR8etH3tOd8b3vQxn7Df R/iWbDnzbz+oNh9xgUIo9SoSJre2Yzp5AMnElWaYm5M79O1Cx6Og6yRIMRTewRB3ExFnnl 8RGlIQ1EQ1RmCSwtAasmj1V9lAO06rhV/xofn1wUuMhVSVykHECKyCPI7OIgQQSeLaqaf7 avAZURG5EeBwRFkzFW6cNsF3pipsC3aNnkWjcFJG976dClk+MlDiOQqVert5Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=88aff320c8058eec9b5c4f73bdbdb861e29da47a commit 88aff320c8058eec9b5c4f73bdbdb861e29da47a Author: Roger Pau Monné AuthorDate: 2022-03-16 09:20:51 +0000 Commit: Roger Pau Monné CommitDate: 2022-03-23 13:44:07 +0000 x86/xen: fix CPUID signature Reviewed by: cem Sponsored by: Citrix Systems R&D (cherry picked from commit 396a8479b0ac310801e998bb1c3dcc6ba4839454) --- 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 */