diff options
| author | Xiaoyao Li | 2020-07-13 19:44:36 +0200 |
|---|---|---|
| committer | Eduardo Habkost | 2020-07-16 17:04:42 +0200 |
| commit | f9f08e7cae8a6c292cacaf6531ede88786fcb3d3 (patch) | |
| tree | 3ddcdecd2b3da2592e020a44e07b6b09a90428fb /target | |
| parent | i368/cpu: Clear env->user_features after loading versioned CPU model (diff) | |
| download | qemu-f9f08e7cae8a6c292cacaf6531ede88786fcb3d3.tar.gz qemu-f9f08e7cae8a6c292cacaf6531ede88786fcb3d3.tar.xz qemu-f9f08e7cae8a6c292cacaf6531ede88786fcb3d3.zip | |
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>
Diffstat (limited to 'target')
| -rw-r--r-- | target/i386/cpu.c | 1 |
1 files changed, 0 insertions, 1 deletions
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; } } |