From: Xin Li (Intel) <xin@zytor.com>
Date: Fri, 3 Jan 2025 08:48:25 +0000 (-0800)
Subject: target/i386: Remove FRED dependency on WRMSRNS
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f80e4707cb05ab356c69ae8fde8537ef0b5810d;p=thirdparty%2Fqemu.git

target/i386: Remove FRED dependency on WRMSRNS

WRMSRNS doesn't become a required feature for FERD, and Linux has
removed the dependency, as such remove it from Qemu.

Cc: qemu-stable@nongnu.org
Signed-off-by: Xin Li (Intel) <xin@zytor.com>
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
Link: https://lore.kernel.org/r/20250103084827.1820007-2-xin@zytor.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 0b901459a87a7fdbed36e574aae33e0635a3e9af)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 5e12cba1b8..2c9517f56d 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -1774,10 +1774,6 @@ static FeatureDep feature_dependencies[] = {
         .from = { FEAT_7_1_EAX,             CPUID_7_1_EAX_LKGS },
         .to = { FEAT_7_1_EAX,               CPUID_7_1_EAX_FRED },
     },
-    {
-        .from = { FEAT_7_1_EAX,             CPUID_7_1_EAX_WRMSRNS },
-        .to = { FEAT_7_1_EAX,               CPUID_7_1_EAX_FRED },
-    },
     {
         .from = { FEAT_7_0_EBX,             CPUID_7_0_EBX_SGX },
         .to = { FEAT_7_0_ECX,               CPUID_7_0_ECX_SGX_LC },