[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/19] target-i386: Filter KVM and 0xC0000001 feature
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 08/19] target-i386: Filter KVM and 0xC0000001 features on TCG |
Date: |
Thu, 26 Jun 2014 00:12:08 +0200 |
From: Eduardo Habkost <address@hidden>
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.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <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 077df27..38b007f 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -585,7 +585,9 @@ struct X86CPUDefinition {
TCG_EXT2_X86_64_FEATURES)
#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:
@@ -2606,6 +2608,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.4.5
- [Qemu-devel] [PULL 03/19] target-i386: Merge feature filtering/checking functions, (continued)
- [Qemu-devel] [PULL 03/19] target-i386: Merge feature filtering/checking functions, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 02/19] target-i386: Simplify reporting of unavailable features, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 06/19] target-i386: Make TCG feature filtering more readable, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 07/19] target-i386: Filter FEAT_7_0_EBX TCG features too, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 09/19] target-i386: Define TCG_*_FEATURES earlier in cpu.c, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 05/19] target-i386: Isolate KVM-specific code on CPU feature filtering logic, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 10/19] target-i386: Loop-based copying and setting/unsetting of feature words, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 04/19] target-i386: Pass FeatureWord argument to report_unavailable_features(), Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 13/19] target-i386: Add "migratable" property to "host" CPU model, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 11/19] target-i386: Loop-based feature word filtering in TCG mode, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 08/19] target-i386: Filter KVM and 0xC0000001 features on TCG,
Andreas Färber <=
- [Qemu-devel] [PULL 16/19] target-i386: block migration and savevm if invariant tsc is exposed, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 14/19] target-i386: Set migratable=yes by default on "host" CPU mooel, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 17/19] target-i386: Support "invariant tsc" flag, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 19/19] target-i386: Broadwell CPU model, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 15/19] savevm: check vmsd for migratability status, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 18/19] target-i386: Fix indentation of CPU model definitions, Andreas Färber, 2014/06/25
- Re: [Qemu-devel] [PULL 00/19] QOM CPUState patch queue 2014-06-26, Peter Maydell, 2014/06/26