[qemu-xen staging] i386/cpu: Don't add unavailable_features to env->user_features

[patchbot@xxxxxxx]

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

    i386/cpu: Don't add unavailable_features to env->user_features
    
    Features unavailable due to absent of their dependent features should
    not be added to env->user_features. env->user_features only contains the
    feature explicity specified with -feature/+feature by user.
    
    Fixes: 99e24dbdaa68 ("target/i386: introduce generic feature dependency 
mechanism")
    Signed-off-by: Xiaoyao Li <xiaoyao.li@xxxxxxxxx>
    Message-Id: <20200713174436.41070-3-xiaoyao.li@xxxxxxxxx>
    Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
---
 target/i386/cpu.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index caf0334f3a..93b62b2eca 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6371,7 +6371,6 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error 
**errp)
                                       unavailable_features & 
env->user_features[d->to.index],
                                       "This feature depends on other features 
that were not requested");
 
-            env->user_features[d->to.index] |= unavailable_features;
             env->features[d->to.index] &= ~unavailable_features;
         }
     }
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging