Commit f9f08e7c authored by Xiaoyao Li's avatar Xiaoyao Li Committed by Eduardo Habkost
Browse files

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: 99e24dbd ("target/i386: introduce generic feature dependency mechanism")
Signed-off-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Message-Id: <20200713174436.41070-3-xiaoyao.li@intel.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 1f43671a

target/i386/cpu.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

        }

    }