From 56bb24e543f9ddd27c74178f3398b7a1dbb2742a Mon Sep 17 00:00:00 2001 From: Chenyi Qiang Date: Wed, 30 Jun 2021 09:20:53 +0800 Subject: [PATCH 1/2] target/i386: Remove split lock detect in Snowridge CPU model At present, there's no mechanism intelligent enough to virtualize split lock detection correctly. Remove it in Snowridge CPU model to avoid the feature exposure. Signed-off-by: Chenyi Qiang Message-Id: <20210630012053.10098-1-chenyi.qiang@intel.com> Signed-off-by: Eduardo Habkost --- target/i386/cpu.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 34a7ce865b..aebf81d9c9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3682,6 +3682,14 @@ static const X86CPUDefinition builtin_x86_defs[] = { { /* end of list */ }, }, }, + { + .version = 4, + .note = "no split lock detect", + .props = (PropValue[]) { + { "split-lock-detect", "off" }, + { /* end of list */ }, + }, + }, { /* end of list */ }, }, }, From f429dbf8fc526a9cacf531176b28d0c65701475a Mon Sep 17 00:00:00 2001 From: Yang Zhong Date: Fri, 20 Aug 2021 13:46:11 +0800 Subject: [PATCH 2/2] i386/cpu: Remove AVX_VNNI feature from Cooperlake cpu model The AVX_VNNI feature is not in Cooperlake platform, remove it from cpu model. Signed-off-by: Yang Zhong Message-Id: <20210820054611.84303-1-yang.zhong@intel.com> Fixes: c1826ea6a052 ("i386/cpu: Expose AVX_VNNI instruction to guest") Cc: qemu-stable@nongnu.org Signed-off-by: Eduardo Habkost --- target/i386/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index aebf81d9c9..97e250e876 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3102,7 +3102,7 @@ static const X86CPUDefinition builtin_x86_defs[] = { MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY | MSR_ARCH_CAP_MDS_NO | MSR_ARCH_CAP_PSCHANGE_MC_NO | MSR_ARCH_CAP_TAA_NO, .features[FEAT_7_1_EAX] = - CPUID_7_1_EAX_AVX_VNNI | CPUID_7_1_EAX_AVX512_BF16, + CPUID_7_1_EAX_AVX512_BF16, /* XSAVES is added in version 2 */ .features[FEAT_XSAVE] = CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |