[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-cpu v2 07/10] target-i386: Filter KVM and 0xC000
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH qom-cpu v2 07/10] target-i386: Filter KVM and 0xC0000001 features on TCG |
Date: |
Mon, 17 Mar 2014 16:51:51 -0300 |
TCG doesn't support any of the feature flags on FEAT_KVM and
FEAT_C000_0001_EDX feature words, so clear all bits on those feature
words.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
target-i386/cpu.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 914b4ff..30dd374 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -581,7 +581,9 @@ struct X86CPUDefinition {
CPUID_EXT2_PDPE1GB */
#define TCG_EXT3_FEATURES (CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM | \
CPUID_EXT3_CR8LEG | CPUID_EXT3_ABM | CPUID_EXT3_SSE4A)
+#define TCG_EXT4_FEATURES 0
#define TCG_SVM_FEATURES 0
+#define TCG_KVM_FEATURES 0
#define TCG_7_0_EBX_FEATURES (CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_SMAP | \
CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ADX)
/* missing:
@@ -2593,6 +2595,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error
**errp)
env->features[FEAT_8000_0001_EDX] &= TCG_EXT2_FEATURES;
env->features[FEAT_8000_0001_ECX] &= TCG_EXT3_FEATURES;
env->features[FEAT_SVM] &= TCG_SVM_FEATURES;
+ env->features[FEAT_KVM] &= TCG_KVM_FEATURES;
+ env->features[FEAT_C000_0001_EDX] &= TCG_EXT4_FEATURES;
} else {
if (x86_cpu_filter_features(cpu) && cpu->enforce_cpuid) {
error_setg(&local_err,
--
1.8.5.3
- [Qemu-devel] [PATCH qom-cpu v2 00/10] target-i386: Support check/enforce flags in TCG mode, too, Eduardo Habkost, 2014/03/17
- [Qemu-devel] [PATCH qom-cpu v2 02/10] target-i386: Merge feature filtering/checking functions, Eduardo Habkost, 2014/03/17
- [Qemu-devel] [PATCH qom-cpu v2 04/10] target-i386: Isolate KVM-specific code on CPU feature filtering logic, Eduardo Habkost, 2014/03/17
- [Qemu-devel] [PATCH qom-cpu v2 03/10] target-i386: Pass FeatureWord argument to report_unavailable_features(), Eduardo Habkost, 2014/03/17
- [Qemu-devel] [PATCH qom-cpu v2 05/10] target-i386: Make TCG feature filtering more readable, Eduardo Habkost, 2014/03/17
- [Qemu-devel] [PATCH qom-cpu v2 06/10] target-i386: Filter FEAT_7_0_EBX TCG features too, Eduardo Habkost, 2014/03/17
- [Qemu-devel] [PATCH qom-cpu v2 07/10] target-i386: Filter KVM and 0xC0000001 features on TCG,
Eduardo Habkost <=
- [Qemu-devel] [PATCH qom-cpu v2 08/10] target-i386: Define TCG_*_FEATURES earlier on cpu.c, Eduardo Habkost, 2014/03/17
- [Qemu-devel] [PATCH qom-cpu v2 09/10] target-i386: Loop-based feature word filtering in TCG mode, Eduardo Habkost, 2014/03/17
- [Qemu-devel] [PATCH qom-cpu v2 10/10] target-i386: Support check/enforce flags in TCG mode, too, Eduardo Habkost, 2014/03/17
- [Qemu-devel] [PATCH qom-cpu v2 01/10] target-i386: Simplify reporting of unavailable features, Eduardo Habkost, 2014/03/17