Commit 1f43671a authored by Xiaoyao Li's avatar Xiaoyao Li Committed by Eduardo Habkost
Browse files

i368/cpu: Clear env->user_features after loading versioned CPU model 



Features defined in versioned CPU model are recorded in env->user_features
since they are updated as property. It's unwated because they are not
user specified.

Simply clear env->user_features as a fix. It won't clear user specified
features because user specified features are filled to
env->user_features later in x86_cpu_expand_features().

Cc: Chenyi Qiang <chenyi.qiang@intel.com>
Suggested-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Message-Id: <20200713174436.41070-2-xiaoyao.li@intel.com>
[ehabkost: fix coding style]
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent ee5128bb

target/i386/cpu.c

+7 −0
Original line number Diff line number Diff line
@@ -5159,6 +5159,13 @@ static void x86_cpu_load_model(X86CPU *cpu, X86CPUModel *model) 
    object_property_set_str(OBJECT(cpu), "vendor", vendor, &error_abort);



    x86_cpu_apply_version_props(cpu, model);



    /*

     * Properties in versioned CPU model are not user specified features.

     * We can simply clear env->user_features here since it will be filled later

     * in x86_cpu_expand_features() based on plus_features and minus_features.

     */

    memset(&env->user_features, 0, sizeof(env->user_features));

}



#ifndef CONFIG_USER_ONLY