diff options
| author | Xiaoyao Li <xiaoyao.li@intel.com> | 2020-07-14 01:44:35 +0800 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2020-07-16 11:04:42 -0400 |
| commit | 1f43671a0d55d863f9111535ca4241e9fa238506 (patch) | |
| tree | 993ae1f8b94fbf0c20536677c76cbeddaaf9d68e /target | |
| parent | ee5128bb00f90dd301991d80d1db5224ce924c84 (diff) | |
| download | qemu-1f43671a0d55d863f9111535ca4241e9fa238506.zip qemu-1f43671a0d55d863f9111535ca4241e9fa238506.tar.gz qemu-1f43671a0d55d863f9111535ca4241e9fa238506.tar.bz2 | |
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: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Message-Id: <20200713174436.41070-2-xiaoyao.li@intel.com>
[ehabkost: fix coding style]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/i386/cpu.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1e51232..caf0334 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -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 |