| Message ID | 20200713174436.41070-2-xiaoyao.li@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fixes for env->user_features | expand |
On Tue, Jul 14, 2020 at 01:44:35AM +0800, Xiaoyao Li wrote: > 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: Eduardo Habkost <ehabkost@redhat.com> > Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > target/i386/cpu.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index 1e5123251d74..9812d5747f35 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -5159,6 +5159,12 @@ 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 > -- > 2.18.4 >
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1e5123251d74..9812d5747f35 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5159,6 +5159,12 @@ 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
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: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> --- target/i386/cpu.c | 6 ++++++ 1 file changed, 6 insertions(+)