Commit 9b15cd9e authored by Igor Mammedov's avatar Igor Mammedov Committed by Andreas Färber
Browse files

target-i386: Sanitize AMD's ext2_features at realize time 



When CPU properties are implemented, ext2_features may change
between object_new(CPU) and cpu_realize_fn(). Sanitizing
ext2_features for AMD based CPU at realize() time will keep
current behavior after CPU features are converted to properties.

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 4586f157

target-i386/cpu.c

+11 −10
Original line number Diff line number Diff line
@@ -1561,16 +1561,6 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) 
    object_property_set_int(OBJECT(cpu), (int64_t)def->tsc_khz * 1000,

                            "tsc-frequency", &error);



    /* On AMD CPUs, some CPUID[8000_0001].EDX bits must match the bits on

     * CPUID[1].EDX.

     */

    if (env->cpuid_vendor1 == CPUID_VENDOR_AMD_1 &&

            env->cpuid_vendor2 == CPUID_VENDOR_AMD_2 &&

            env->cpuid_vendor3 == CPUID_VENDOR_AMD_3) {

        env->cpuid_ext2_features &= ~CPUID_EXT2_AMD_ALIASES;

        env->cpuid_ext2_features |= (def->features & CPUID_EXT2_AMD_ALIASES);

    }



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

    if (error) {

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

    }



    /* On AMD CPUs, some CPUID[8000_0001].EDX bits must match the bits on

     * CPUID[1].EDX.

     */

    if (env->cpuid_vendor1 == CPUID_VENDOR_AMD_1 &&

        env->cpuid_vendor2 == CPUID_VENDOR_AMD_2 &&

        env->cpuid_vendor3 == CPUID_VENDOR_AMD_3) {

        env->cpuid_ext2_features &= ~CPUID_EXT2_AMD_ALIASES;

        env->cpuid_ext2_features |= (env->cpuid_features

           & CPUID_EXT2_AMD_ALIASES);

    }



    if (!kvm_enabled()) {

        env->cpuid_features &= TCG_FEATURES;

        env->cpuid_ext_features &= TCG_EXT_FEATURES;