diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2018-06-11 17:37:12 -0300 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2018-06-22 15:01:15 -0300 |
| commit | 9ccb9784b57804f5c74434ad6ccb66650a015ffc (patch) | |
| tree | 5e0e7a5a6dcb6261245258dab4d3ece982878d25 | |
| parent | f1a23522b03a569f13aad49294bb4c4b1a9500c7 (diff) | |
| download | qemu-9ccb9784b57804f5c74434ad6ccb66650a015ffc.zip qemu-9ccb9784b57804f5c74434ad6ccb66650a015ffc.tar.gz qemu-9ccb9784b57804f5c74434ad6ccb66650a015ffc.tar.bz2 | |
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: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180611203712.12086-1-ehabkost@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | target/i386/cpu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 60deae3..d7dfefc 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -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, |