Commit 9ccb9784 authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

i386: Remove ospke CPUID flag name 



OSPKE is not a static feature flag: it changes dynamically at
runtime depending on CR4, and it was never configurable: KVM
never returned OSPKE on GET_SUPPORTED_CPUID, and on TCG enables
it automatically if CR4_PKE_MASK is set.

Remove OSPKE from the feature name array so users don't try to
configure it manually.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180611203712.12086-1-ehabkost@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent f1a23522

target/i386/cpu.c

+3 −2
Original line number Diff line number Diff line
@@ -738,7 +738,8 @@ static void x86_cpu_vendor_words2str(char *dst, uint32_t vendor1, 
          CPUID_7_0_EBX_HLE, CPUID_7_0_EBX_AVX2,

          CPUID_7_0_EBX_INVPCID, CPUID_7_0_EBX_RTM,

          CPUID_7_0_EBX_RDSEED */

#define TCG_7_0_ECX_FEATURES (CPUID_7_0_ECX_PKU | CPUID_7_0_ECX_OSPKE | \

#define TCG_7_0_ECX_FEATURES (CPUID_7_0_ECX_PKU | \

          /* CPUID_7_0_ECX_OSPKE is dynamic */ \

          CPUID_7_0_ECX_LA57)

#define TCG_7_0_EDX_FEATURES 0

#define TCG_APM_FEATURES 0
@@ -955,7 +956,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { 
    [FEAT_7_0_ECX] = {

        .feat_names = {

            NULL, "avx512vbmi", "umip", "pku",

            "ospke", NULL, "avx512vbmi2", NULL,

            NULL /* ospke */, NULL, "avx512vbmi2", NULL,

            "gfni", "vaes", "vpclmulqdq", "avx512vnni",

            "avx512bitalg", NULL, "avx512-vpopcntdq", NULL,

            "la57", NULL, NULL, NULL,