[qemu-xen stable-4.16] i386/cpu: Remove AVX_VNNI feature from Cooperlake cpu model

[patchbot@xxxxxxx]

commit ff6d391e10d04a457994be8c032c6c38c0118ebc
Author:     Yang Zhong <yang.zhong@xxxxxxxxx>
AuthorDate: Fri Aug 20 13:46:11 2021 +0800
Commit:     Michael Roth <michael.roth@xxxxxxx>
CommitDate: Tue Dec 14 12:43:09 2021 -0600

    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 <yang.zhong@xxxxxxxxx>
    Message-Id: <20210820054611.84303-1-yang.zhong@xxxxxxxxx>
    Fixes: c1826ea6a052 ("i386/cpu: Expose AVX_VNNI instruction to guest")
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
    (cherry picked from commit f429dbf8fc526a9cacf531176b28d0c65701475a)
    Signed-off-by: Michael Roth <michael.roth@xxxxxxx>
---
 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 34a7ce865b..24ddc5b926 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 |
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.16