[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RESEND v4 06/18] target-i386: Make TCG feature filte
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH RESEND v4 06/18] target-i386: Make TCG feature filtering more readable |
Date: |
Wed, 14 May 2014 16:29:58 -0300 |
Instead of an #ifdef in the middle of the code, just set
TCG_EXT2_FEATURES to a different value depending on TARGET_X86_64.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes v1 -> v2:
* Trivial rebase to latest qom-cpu (commit 90c5d39c)
(Reviewed-by line kept)
Changes v2 -> v3:
* Trivial rebase after QEMU 2.0 (onto commit 2d03b49)
(Reviewed-by line kept)
---
target-i386/cpu.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 4dd522a..1a1e390 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -572,9 +572,17 @@ struct X86CPUDefinition {
CPUID_EXT_X2APIC, CPUID_EXT_TSC_DEADLINE_TIMER, CPUID_EXT_XSAVE,
CPUID_EXT_OSXSAVE, CPUID_EXT_AVX, CPUID_EXT_F16C,
CPUID_EXT_RDRAND */
+
+#ifdef TARGET_X86_64
+#define TCG_EXT2_X86_64_FEATURES (CPUID_EXT2_SYSCALL | CPUID_EXT2_LM)
+#else
+#define TCG_EXT2_X86_64_FEATURES 0
+#endif
+
#define TCG_EXT2_FEATURES ((TCG_FEATURES & CPUID_EXT2_AMD_ALIASES) | \
CPUID_EXT2_NX | CPUID_EXT2_MMXEXT | CPUID_EXT2_RDTSCP | \
- CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT)
+ CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT | \
+ TCG_EXT2_X86_64_FEATURES)
/* missing:
CPUID_EXT2_PDPE1GB */
#define TCG_EXT3_FEATURES (CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM | \
@@ -2596,11 +2604,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error
**errp)
if (!kvm_enabled()) {
env->features[FEAT_1_EDX] &= TCG_FEATURES;
env->features[FEAT_1_ECX] &= TCG_EXT_FEATURES;
- env->features[FEAT_8000_0001_EDX] &= (TCG_EXT2_FEATURES
-#ifdef TARGET_X86_64
- | CPUID_EXT2_SYSCALL | CPUID_EXT2_LM
-#endif
- );
+ 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;
} else {
--
1.9.0
- [Qemu-devel] [PATCH RESEND v4 00/18] target-i386: CPU feature flag queue, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 03/18] target-i386: Merge feature filtering/checking functions, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 01/18] target-i386: kvm: Don't enable MONITOR by default on any CPU model, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 02/18] target-i386: Simplify reporting of unavailable features, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 06/18] target-i386: Make TCG feature filtering more readable,
Eduardo Habkost <=
- [Qemu-devel] [PATCH RESEND v4 05/18] target-i386: Isolate KVM-specific code on CPU feature filtering logic, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 04/18] target-i386: Pass FeatureWord argument to report_unavailable_features(), Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 07/18] target-i386: Filter FEAT_7_0_EBX TCG features too, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 08/18] target-i386: Filter KVM and 0xC0000001 features on TCG, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 09/18] target-i386: Define TCG_*_FEATURES earlier on cpu.c, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 10/18] target-i386: Loop-based copying and setting/unsetting of feature words, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 11/18] target-i386: Loop-based feature word filtering in TCG mode, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 12/18] target-i386: Support check/enforce flags in TCG mode, too, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 13/18] target-i386: Support "-cpu host" in TCG mode, Eduardo Habkost, 2014/05/14
- [Qemu-devel] [PATCH RESEND v4 15/18] target-i386: Set migratable=yes by default, Eduardo Habkost, 2014/05/14