@@ -1200,20 +1200,20 @@ static int unavailable_host_feature(FeatureWordInfo *f, uint32_t mask)
*
* This function may be called only if KVM is enabled.
*/
-static int kvm_check_features_against_host(X86CPU *cpu)
+static int kvm_check_features_against_host(KVMState *s, X86CPU *cpu)
{
CPUX86State *env = &cpu->env;
- x86_def_t host_def;
int rv = 0;
FeatureWord w;
assert(kvm_enabled());
- kvm_cpu_fill_host(&host_def);
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 host_feat = kvm_arch_get_supported_cpuid(s, wi->cpuid_eax,
+ wi->cpuid_ecx,
+ wi->cpuid_reg);
uint32_t mask;
for (mask = 1; mask; mask <<= 1) {
if (guest_feat & mask && !(host_feat & mask)) {
@@ -2516,7 +2516,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
env->features[FEAT_8000_0001_ECX] &= TCG_EXT3_FEATURES;
env->features[FEAT_SVM] &= TCG_SVM_FEATURES;
} else {
- if (check_cpuid && kvm_check_features_against_host(cpu)
+ KVMState *s = kvm_state;
+ if (check_cpuid && kvm_check_features_against_host(s, cpu)
&& enforce_cpuid) {
error_setg(&local_err,
"Host's CPU doesn't support requested features");
As now kvm_cpu_fill_host() will simply fill the x86_def_t.features array with the results of kvm_arch_get_supported_cpuid() calls, we can simply call kvm_arch_get_supported_cpuid() directly. Note how kvm_check_features_against_host() and filter_features_for_kvm() are getting very similar. Eventually they should become a single function. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- target-i386/cpu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)