From: Robert Hoo Date: Wed, 19 Dec 2018 13:44:40 +0000 (+0800) Subject: i386: remove the new CPUID 'PCONFIG' from Icelake-Server CPU model X-Git-Tag: v3.1.1~70 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02d735c274177b7cd86bae02099b2602cafff8bd;p=thirdparty%2Fqemu.git i386: remove the new CPUID 'PCONFIG' from Icelake-Server CPU model PCONFIG is not available to guests; it must be specifically enabled using the PCONFIG_ENABLE execution control. Disable it, because no one can ever use it. Signed-off-by: Robert Hoo Message-Id: <1545227081-213696-2-git-send-email-robert.hu@linux.intel.com> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit 76e5a4d58357b9d077afccf7f7c82e17f733b722) Signed-off-by: Michael Roth --- diff --git a/target/i386/cpu.c b/target/i386/cpu.c index f81d35e1f91..83152204b56 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2613,8 +2613,7 @@ static X86CPUDefinition builtin_x86_defs[] = { CPUID_7_0_ECX_AVX512VNNI | CPUID_7_0_ECX_AVX512BITALG | CPUID_7_0_ECX_AVX512_VPOPCNTDQ | CPUID_7_0_ECX_LA57, .features[FEAT_7_0_EDX] = - CPUID_7_0_EDX_PCONFIG | CPUID_7_0_EDX_SPEC_CTRL | - CPUID_7_0_EDX_SPEC_CTRL_SSBD, + CPUID_7_0_EDX_SPEC_CTRL | CPUID_7_0_EDX_SPEC_CTRL_SSBD, /* Missing: XSAVES (not supported by some Linux versions, * including v4.1 to v4.12). * KVM doesn't yet expose any XSAVES state save component,