[qemu-xen staging] i368/cpu: Clear env->user_features after loading versioned CPU model

[patchbot@xxxxxxx]

commit 1f43671a0d55d863f9111535ca4241e9fa238506
Author:     Xiaoyao Li <xiaoyao.li@xxxxxxxxx>
AuthorDate: Tue Jul 14 01:44:35 2020 +0800
Commit:     Eduardo Habkost <ehabkost@xxxxxxxxxx>
CommitDate: Thu Jul 16 11:04:42 2020 -0400

    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@xxxxxxxxx>
    Suggested-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
    Signed-off-by: Xiaoyao Li <xiaoyao.li@xxxxxxxxx>
    Message-Id: <20200713174436.41070-2-xiaoyao.li@xxxxxxxxx>
    [ehabkost: fix coding style]
    Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
---
 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
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging