|
 |
9ae3a8 |
From 6d76a3d10423f99561a431964637b58d7e5f2e77 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 23 Feb 2017 14:29:39 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 09/17] target-i386: kvm_check_features_against_host(): Kill
|
|
|
9ae3a8 |
feature word array
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Message-id: <20170223142945.17790-9-ehabkost@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 74039
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.4 qemu-kvm PATCH v2 08/14] target-i386: kvm_check_features_against_host(): Kill feature word array
|
|
|
9ae3a8 |
Bugzilla: 1382122
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
We don't need the ft[] array on kvm_check_features_against_host()
|
|
|
9ae3a8 |
anymore, as we can simply use the feature_word_info[] array, that has
|
|
|
9ae3a8 |
everything we need.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit f0b9b11164482a8a2283dee25cecc4a4c531259e)
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
target-i386/cpu.c | 57 ++++++++++++-------------------------------------------
|
|
|
9ae3a8 |
1 file changed, 12 insertions(+), 45 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
9ae3a8 |
index 22ad4f9..bb8abf7 100644
|
|
|
9ae3a8 |
--- a/target-i386/cpu.c
|
|
|
9ae3a8 |
+++ b/target-i386/cpu.c
|
|
|
9ae3a8 |
@@ -1303,57 +1303,23 @@ static int unavailable_host_feature(FeatureWordInfo *f, uint32_t mask)
|
|
|
9ae3a8 |
*
|
|
|
9ae3a8 |
* This function may be called only if KVM is enabled.
|
|
|
9ae3a8 |
*/
|
|
|
9ae3a8 |
-static int kvm_check_features_against_host(X86CPU *cpu)
|
|
|
9ae3a8 |
+static int kvm_check_features_against_host(KVMState *s, X86CPU *cpu)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
CPUX86State *env = &cpu->env;
|
|
|
9ae3a8 |
- x86_def_t host_def;
|
|
|
9ae3a8 |
- uint32_t mask;
|
|
|
9ae3a8 |
- int rv, i;
|
|
|
9ae3a8 |
- struct model_features_t ft[] = {
|
|
|
9ae3a8 |
- {&env->features[FEAT_1_EDX],
|
|
|
9ae3a8 |
- &host_def.features[FEAT_1_EDX],
|
|
|
9ae3a8 |
- FEAT_1_EDX },
|
|
|
9ae3a8 |
- {&env->features[FEAT_1_ECX],
|
|
|
9ae3a8 |
- &host_def.features[FEAT_1_ECX],
|
|
|
9ae3a8 |
- FEAT_1_ECX },
|
|
|
9ae3a8 |
- {&env->features[FEAT_8000_0001_EDX],
|
|
|
9ae3a8 |
- &host_def.features[FEAT_8000_0001_EDX],
|
|
|
9ae3a8 |
- FEAT_8000_0001_EDX },
|
|
|
9ae3a8 |
- {&env->features[FEAT_8000_0001_ECX],
|
|
|
9ae3a8 |
- &host_def.features[FEAT_8000_0001_ECX],
|
|
|
9ae3a8 |
- FEAT_8000_0001_ECX },
|
|
|
9ae3a8 |
- {&env->features[FEAT_C000_0001_EDX],
|
|
|
9ae3a8 |
- &host_def.features[FEAT_C000_0001_EDX],
|
|
|
9ae3a8 |
- FEAT_C000_0001_EDX },
|
|
|
9ae3a8 |
- {&env->features[FEAT_7_0_EBX],
|
|
|
9ae3a8 |
- &host_def.features[FEAT_7_0_EBX],
|
|
|
9ae3a8 |
- FEAT_7_0_EBX },
|
|
|
9ae3a8 |
- {&env->features[FEAT_7_0_ECX],
|
|
|
9ae3a8 |
- &host_def.features[FEAT_7_0_ECX],
|
|
|
9ae3a8 |
- FEAT_7_0_ECX },
|
|
|
9ae3a8 |
- {&env->features[FEAT_7_0_EDX],
|
|
|
9ae3a8 |
- &host_def.features[FEAT_7_0_EDX],
|
|
|
9ae3a8 |
- FEAT_7_0_EDX },
|
|
|
9ae3a8 |
- {&env->features[FEAT_XSAVE],
|
|
|
9ae3a8 |
- &host_def.features[FEAT_XSAVE],
|
|
|
9ae3a8 |
- FEAT_XSAVE },
|
|
|
9ae3a8 |
- {&env->features[FEAT_SVM],
|
|
|
9ae3a8 |
- &host_def.features[FEAT_SVM],
|
|
|
9ae3a8 |
- FEAT_SVM },
|
|
|
9ae3a8 |
- {&env->features[FEAT_KVM],
|
|
|
9ae3a8 |
- &host_def.features[FEAT_KVM],
|
|
|
9ae3a8 |
- FEAT_KVM },
|
|
|
9ae3a8 |
- };
|
|
|
9ae3a8 |
+ int rv = 0;
|
|
|
9ae3a8 |
+ FeatureWord w;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
assert(kvm_enabled());
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- kvm_cpu_fill_host(&host_def);
|
|
|
9ae3a8 |
- for (rv = 0, i = 0; i < ARRAY_SIZE(ft); ++i) {
|
|
|
9ae3a8 |
- FeatureWord w = ft[i].feat_word;
|
|
|
9ae3a8 |
+ for (w = 0; w < FEATURE_WORDS; w++) {
|
|
|
9ae3a8 |
FeatureWordInfo *wi = &feature_word_info[w];
|
|
|
9ae3a8 |
+ uint32_t guest_feat = env->features[w];
|
|
|
9ae3a8 |
+ uint32_t host_feat = kvm_arch_get_supported_cpuid(s, wi->cpuid_eax,
|
|
|
9ae3a8 |
+ wi->cpuid_ecx,
|
|
|
9ae3a8 |
+ wi->cpuid_reg);
|
|
|
9ae3a8 |
+ uint32_t mask;
|
|
|
9ae3a8 |
for (mask = 1; mask; mask <<= 1) {
|
|
|
9ae3a8 |
- if (*ft[i].guest_feat & mask &&
|
|
|
9ae3a8 |
- !(*ft[i].host_feat & mask)) {
|
|
|
9ae3a8 |
+ if (guest_feat & mask && !(host_feat & mask)) {
|
|
|
9ae3a8 |
unavailable_host_feature(wi, mask);
|
|
|
9ae3a8 |
rv = 1;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
@@ -2677,8 +2643,9 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
|
9ae3a8 |
env->features[FEAT_7_0_ECX] &= TCG_7_0_ECX_FEATURES;
|
|
|
9ae3a8 |
env->features[FEAT_7_0_EDX] &= TCG_7_0_EDX_FEATURES;
|
|
|
9ae3a8 |
} else {
|
|
|
9ae3a8 |
+ KVMState *s = kvm_state;
|
|
|
9ae3a8 |
if ((cpu->check_cpuid || cpu->enforce_cpuid)
|
|
|
9ae3a8 |
- && kvm_check_features_against_host(cpu) && cpu->enforce_cpuid) {
|
|
|
9ae3a8 |
+ && kvm_check_features_against_host(s, cpu) && cpu->enforce_cpuid) {
|
|
|
9ae3a8 |
error_setg(&local_err,
|
|
|
9ae3a8 |
"Host's CPU doesn't support requested features");
|
|
|
9ae3a8 |
goto out;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|