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@intel.com> Message-Id: <20200713174436.41070-3-xiaoyao.li@intel.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
1f43671a0d
commit
f9f08e7cae
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user