Commit 034acf4a authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Andreas Färber
Browse files

target-i386: Introduce X86CPU::filtered_features field 



This field will contain the feature bits that were filtered out because
of missing host support.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 8e8aba50

target-i386/cpu-qom.h

+3 −0
Original line number Diff line number Diff line
@@ -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)

target-i386/cpu.c

+6 −3
Original line number Diff line number Diff line
@@ -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,

        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