[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/11] target-i386: Introduce X86CPU::filtered_featur
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 04/11] target-i386: Introduce X86CPU::filtered_features field |
Date: |
Mon, 6 May 2013 22:43:24 +0200 |
From: Eduardo Habkost <address@hidden>
This field will contain the feature bits that were filtered out because
of missing host support.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/cpu-qom.h | 3 +++
target-i386/cpu.c | 9 ++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
index f890f1c..849cedf 100644
--- a/target-i386/cpu-qom.h
+++ b/target-i386/cpu-qom.h
@@ -65,6 +65,9 @@ typedef struct X86CPU {
/*< public >*/
CPUX86State env;
+
+ /* Features that were filtered out because of missing host capabilities */
+ uint32_t filtered_features[FEATURE_WORDS];
} X86CPU;
static inline X86CPU *x86_env_get_cpu(CPUX86State *env)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 3857514..38793bc 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1698,9 +1698,12 @@ static void filter_features_for_kvm(X86CPU *cpu)
for (w = 0; w < FEATURE_WORDS; w++) {
FeatureWordInfo *wi = &feature_word_info[w];
- env->features[w] &= kvm_arch_get_supported_cpuid(s, wi->cpuid_eax,
- wi->cpuid_ecx,
- wi->cpuid_reg);
+ uint32_t host_feat = kvm_arch_get_supported_cpuid(s, wi->cpuid_eax,
+ wi->cpuid_ecx,
+ wi->cpuid_reg);
+ uint32_t requested_features = env->features[w];
+ env->features[w] &= host_feat;
+ cpu->filtered_features[w] = requested_features & ~env->features[w];
}
}
#endif
--
1.8.1.4
- [Qemu-devel] [PULL for-1.5 00/11] QOM CPUState patch queue 2013-05-06, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 01/11] target-i386: Add ECX information to FeatureWordInfo, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 02/11] target-i386: Use FeatureWord loop on filter_features_for_kvm(), Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 04/11] target-i386: Introduce X86CPU::filtered_features field,
Andreas Färber <=
- [Qemu-devel] [PULL 05/11] target-i386: Add "filtered-features" property to X86CPU, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 08/11] target-i386: Emulate X86CPU subclasses for global properties, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 03/11] target-i386: Add "feature-words" property to X86CPU, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 06/11] qdev: Let qdev_prop_parse() pass through Error, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 07/11] qdev: Introduce qdev_prop_set_globals_for_type(), Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 09/11] target-i386: Change CPUID model of 486 to 8, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 10/11] target-i386: Introduce generic CPUID feature compat function, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 11/11] target-i386: n270 can MOVBE, Andreas Färber, 2013/05/06