[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/6] i368/cpu: Clear env->user_features after loading versioned CP
From: |
Eduardo Habkost |
Subject: |
[PULL 1/6] i368/cpu: Clear env->user_features after loading versioned CPU model |
Date: |
Thu, 16 Jul 2020 14:18:58 -0400 |
From: Xiaoyao Li <xiaoyao.li@intel.com>
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>
---
target/i386/cpu.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 1e5123251d..caf0334f3a 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
--
2.26.2
- [PULL 0/6] x86 fixes for -rc1, Eduardo Habkost, 2020/07/16
- [PULL 2/6] i386/cpu: Don't add unavailable_features to env->user_features, Eduardo Habkost, 2020/07/16
- [PULL 1/6] i368/cpu: Clear env->user_features after loading versioned CPU model,
Eduardo Habkost <=
- [PULL 6/6] i386: hvf: Explicitly set CR4 guest/host mask, Eduardo Habkost, 2020/07/16
- [PULL 5/6] target/i386: add the missing vmx features for Skylake-Server and Cascadelake-Server CPU models, Eduardo Habkost, 2020/07/16
- [PULL 3/6] target/i386: add fast short REP MOV support, Eduardo Habkost, 2020/07/16
- [PULL 4/6] target/i386: fix model number and add missing features for Icelake-Server CPU model, Eduardo Habkost, 2020/07/16
- Re: [PULL 0/6] x86 fixes for -rc1, Peter Maydell, 2020/07/17