[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-cpu 8/9] target-i386: Introduce X86CPU.filtered_
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH qom-cpu 8/9] target-i386: Introduce X86CPU.filtered_features field |
Date: |
Mon, 22 Apr 2013 16:00:19 -0300 |
This field will contain the feature bits that were filtered out because
of missing host support.
Signed-off-by: Eduardo Habkost <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 08f9eb6..159378f 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 bdb94a7..1178c5f 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1642,9 +1642,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] [PATCH qom-cpu 0/9] x86: feature words array (v11) + "feature-words" property, Eduardo Habkost, 2013/04/22
- [Qemu-devel] [PATCH qom-cpu 2/9] target-i386/kvm.c: Code formatting changes, Eduardo Habkost, 2013/04/22
- [Qemu-devel] [PATCH qom-cpu 1/9] target-i386: cleanup: Group together level, xlevel, xlevel2 fields, Eduardo Habkost, 2013/04/22
- [Qemu-devel] [PATCH qom-cpu 3/9] target-i386/cpu.c: Break lines so they don't get too long, Eduardo Habkost, 2013/04/22
- [Qemu-devel] [PATCH qom-cpu 5/9] target-i386: Add ECX information to FeatureWordInfo, Eduardo Habkost, 2013/04/22
- [Qemu-devel] [PATCH qom-cpu 7/9] target-i386: Use FeatureWord loop on filter_features_for_kvm(), Eduardo Habkost, 2013/04/22
- [Qemu-devel] [PATCH qom-cpu 6/9] target-i386: Add "feature-words" property, Eduardo Habkost, 2013/04/22
- [Qemu-devel] [PATCH qom-cpu 8/9] target-i386: Introduce X86CPU.filtered_features field,
Eduardo Habkost <=
- [Qemu-devel] [PATCH qom-cpu 9/9] target-i386: Add "filtered-features" property to X86CPU, Eduardo Habkost, 2013/04/22
- [Qemu-devel] [PATCH qom-cpu 4/9] target-i386: Replace cpuid_*features fields with a feature word array, Eduardo Habkost, 2013/04/22