Commit 4586f157 authored by Igor Mammedov's avatar Igor Mammedov Committed by Andreas Färber
Browse files

target-i386: Filter out unsupported features at realize time 



Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 75a192aa

target-i386/cpu.c

+16 −15
Original line number Diff line number Diff line
@@ -1571,21 +1571,6 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) 
        env->cpuid_ext2_features |= (def->features & CPUID_EXT2_AMD_ALIASES);

    }



    if (!kvm_enabled()) {

        env->cpuid_features &= TCG_FEATURES;

        env->cpuid_ext_features &= TCG_EXT_FEATURES;

        env->cpuid_ext2_features &= (TCG_EXT2_FEATURES

#ifdef TARGET_X86_64

            | CPUID_EXT2_SYSCALL | CPUID_EXT2_LM

#endif

            );

        env->cpuid_ext3_features &= TCG_EXT3_FEATURES;

        env->cpuid_svm_features &= TCG_SVM_FEATURES;

    } else {

#ifdef CONFIG_KVM

        filter_features_for_kvm(cpu);

#endif

    }

    object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error);

    if (error) {

        fprintf(stderr, "%s\n", error_get_pretty(error));
@@ -2106,6 +2091,22 @@ void x86_cpu_realize(Object *obj, Error **errp) 
        env->cpuid_level = 7;

    }



    if (!kvm_enabled()) {

        env->cpuid_features &= TCG_FEATURES;

        env->cpuid_ext_features &= TCG_EXT_FEATURES;

        env->cpuid_ext2_features &= (TCG_EXT2_FEATURES

#ifdef TARGET_X86_64

            | CPUID_EXT2_SYSCALL | CPUID_EXT2_LM

#endif

            );

        env->cpuid_ext3_features &= TCG_EXT3_FEATURES;

        env->cpuid_svm_features &= TCG_SVM_FEATURES;

    } else {

#ifdef CONFIG_KVM

        filter_features_for_kvm(cpu);

#endif

    }



#ifndef CONFIG_USER_ONLY

    qemu_register_reset(x86_cpu_machine_reset_cb, cpu);