[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/6] i386/cpu: Don't add unavailable_features to env->user_feature
From: |
Eduardo Habkost |
Subject: |
[PULL 2/6] i386/cpu: Don't add unavailable_features to env->user_features |
Date: |
Thu, 16 Jul 2020 14:18:59 -0400 |
From: Xiaoyao Li <xiaoyao.li@intel.com>
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>
---
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;
}
}
--
2.26.2
- [PULL 0/6] x86 fixes for -rc1, Eduardo Habkost, 2020/07/16
- [PULL 2/6] i386/cpu: Don't add unavailable_features to env->user_features,
Eduardo Habkost <=
- [PULL 1/6] i368/cpu: Clear env->user_features after loading versioned CPU model, Eduardo Habkost, 2020/07/16
- [PULL 6/6] i386: hvf: Explicitly set CR4 guest/host mask, Eduardo Habkost, 2020/07/16
- [PULL 5/6] target/i386: add the missing vmx features for Skylake-Server and Cascadelake-Server CPU models, Eduardo Habkost, 2020/07/16
- [PULL 3/6] target/i386: add fast short REP MOV support, Eduardo Habkost, 2020/07/16
- [PULL 4/6] target/i386: fix model number and add missing features for Icelake-Server CPU model, Eduardo Habkost, 2020/07/16
- Re: [PULL 0/6] x86 fixes for -rc1, Peter Maydell, 2020/07/17