[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/12] i386: Remove ospke CPUID flag name
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 06/12] i386: Remove ospke CPUID flag name |
Date: |
Mon, 25 Jun 2018 19:25:18 -0300 |
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target/i386/cpu.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 60deae3100..d7dfefcde0 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,
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL 00/12] x86 queue, 2018-06-25, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 01/12] i386: Add support for CPUID_8000_001E for AMD, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 02/12] i386: improve alignment of CPU model listing, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 03/12] i386: improve sorting of CPU model names, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 04/12] i386: display known CPUID features linewrapped, in alphabetical order, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 05/12] i386: Remove osxsave CPUID flag name, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 06/12] i386: Remove ospke CPUID flag name,
Eduardo Habkost <=
- [Qemu-devel] [PULL 07/12] i386: define the AMD 'amd-ssbd' CPUID feature bit, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 08/12] i386: Define AMD's no SSB mitigation needed., Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 09/12] i386: Allow TOPOEXT to be enabled on older kernels, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 10/12] i386: Fix up the Node id for CPUID_8000_001E, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 11/12] i386: Enable TOPOEXT feature on AMD EPYC CPU, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 12/12] i386: Remove generic SMT thread check, Eduardo Habkost, 2018/06/25
- Re: [Qemu-devel] [PULL 00/12] x86 queue, 2018-06-25, Peter Maydell, 2018/06/26