[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/8] target-i386: kvm_check_features_against_host():
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 7/8] target-i386: kvm_check_features_against_host(): Kill feature word array |
Date: |
Sun, 24 Nov 2013 17:55:39 -0200 |
We don't need the ft[] array on kvm_check_features_against_host()
anymore, as we can simply use the feature_word_info[] array, that has
everything we need.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 41 ++++++++---------------------------------
1 file changed, 8 insertions(+), 33 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 9fc8500..6c540c6 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1204,44 +1204,19 @@ static int kvm_check_features_against_host(X86CPU *cpu)
{
CPUX86State *env = &cpu->env;
x86_def_t host_def;
- uint32_t mask;
- int rv, i;
- struct model_features_t ft[] = {
- {&env->features[FEAT_1_EDX],
- &host_def.features[FEAT_1_EDX],
- FEAT_1_EDX },
- {&env->features[FEAT_1_ECX],
- &host_def.features[FEAT_1_ECX],
- FEAT_1_ECX },
- {&env->features[FEAT_8000_0001_EDX],
- &host_def.features[FEAT_8000_0001_EDX],
- FEAT_8000_0001_EDX },
- {&env->features[FEAT_8000_0001_ECX],
- &host_def.features[FEAT_8000_0001_ECX],
- FEAT_8000_0001_ECX },
- {&env->features[FEAT_C000_0001_EDX],
- &host_def.features[FEAT_C000_0001_EDX],
- FEAT_C000_0001_EDX },
- {&env->features[FEAT_7_0_EBX],
- &host_def.features[FEAT_7_0_EBX],
- FEAT_7_0_EBX },
- {&env->features[FEAT_SVM],
- &host_def.features[FEAT_SVM],
- FEAT_SVM },
- {&env->features[FEAT_KVM],
- &host_def.features[FEAT_KVM],
- FEAT_KVM },
- };
+ int rv = 0;
+ FeatureWord w;
assert(kvm_enabled());
-
kvm_cpu_fill_host(&host_def);
- for (rv = 0, i = 0; i < ARRAY_SIZE(ft); ++i) {
- FeatureWord w = ft[i].feat_word;
+
+ for (w = 0; w < FEATURE_WORDS; w++) {
FeatureWordInfo *wi = &feature_word_info[w];
+ uint32_t guest_feat = env->features[w];
+ uint32_t host_feat = host_def.features[w];
+ uint32_t mask;
for (mask = 1; mask; mask <<= 1) {
- if (*ft[i].guest_feat & mask &&
- !(*ft[i].host_feat & mask)) {
+ if (guest_feat & mask && !(host_feat & mask)) {
unavailable_host_feature(wi, mask);
rv = 1;
}
--
1.8.3.1
- [Qemu-devel] [PATCH 0/8] target-i386: Simplify kvm_cpu_fill_host() and kvm_check_features_against_host(), Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 1/8] target-i386: kvm_cpu_fill_host(): Kill unused code, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 2/8] target-i386: kvm_cpu_fill_host(): No need to check level, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 3/8] target-i386: kvm_cpu_fill_host(): No need to check CPU vendor, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 4/8] target-i386: kvm_cpu_fill_host(): No need to check xlevel2, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 5/8] target-i386: kvm_cpu_fill_host(): Set all feature words at end of function, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 6/8] target-i386: kvm_cpu_fill_host(): Fill feature words in a loop, Eduardo Habkost, 2013/11/24
- [Qemu-devel] [PATCH 7/8] target-i386: kvm_check_features_against_host(): Kill feature word array,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 8/8] target-i386: kvm_check_features_against_host(): Don't use kvm_cpu_fill_host(), Eduardo Habkost, 2013/11/24