[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/19] target-i386: Support check/enforce flags in TC
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 12/19] target-i386: Support check/enforce flags in TCG mode, too |
Date: |
Thu, 26 Jun 2014 00:12:12 +0200 |
From: Eduardo Habkost <address@hidden>
If enforce/check is specified in TCG mode, QEMU will ensure all CPU
features are supported by TCG, so no CPU feature is silently disabled.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
[AF: Be explicit about TCG vs. !KVM]
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/cpu.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 3e1dad7..d789cba 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1263,8 +1263,9 @@ static void report_unavailable_features(FeatureWord w,
uint32_t mask)
if (1 << i & mask) {
const char *reg = get_register_name_32(f->cpuid_reg);
assert(reg);
- fprintf(stderr, "warning: host doesn't support requested feature: "
+ fprintf(stderr, "warning: %s doesn't support requested feature: "
"CPUID.%02XH:%s%s%s [bit %d]\n",
+ kvm_enabled() ? "host" : "TCG",
f->cpuid_eax, reg,
f->feat_names[i] ? "." : "",
f->feat_names[i] ? f->feat_names[i] : "", i);
@@ -1829,17 +1830,20 @@ static uint32_t
x86_cpu_get_supported_feature_word(FeatureWord w)
{
FeatureWordInfo *wi = &feature_word_info[w];
- assert(kvm_enabled());
- return kvm_arch_get_supported_cpuid(kvm_state, wi->cpuid_eax,
- wi->cpuid_ecx,
- wi->cpuid_reg);
+ if (kvm_enabled()) {
+ return kvm_arch_get_supported_cpuid(kvm_state, wi->cpuid_eax,
+ wi->cpuid_ecx,
+ wi->cpuid_reg);
+ } else if (tcg_enabled()) {
+ return wi->tcg_features;
+ } else {
+ return ~0;
+ }
}
/*
* Filters CPU feature words based on host availability of each feature.
*
- * This function may be called only if KVM is enabled.
- *
* Returns: 0 if all flags are supported by the host, non-zero otherwise.
*/
static int x86_cpu_filter_features(X86CPU *cpu)
@@ -2596,17 +2600,13 @@ static void x86_cpu_realizefn(DeviceState *dev, Error
**errp)
& CPUID_EXT2_AMD_ALIASES);
}
- if (!kvm_enabled()) {
- FeatureWord w;
- for (w = 0; w < FEATURE_WORDS; w++) {
- env->features[w] &= feature_word_info[w].tcg_features;
- }
- } else {
- if (x86_cpu_filter_features(cpu) && cpu->enforce_cpuid) {
- error_setg(&local_err,
- "Host's CPU doesn't support requested features");
- goto out;
- }
+
+ if (x86_cpu_filter_features(cpu) && cpu->enforce_cpuid) {
+ error_setg(&local_err,
+ kvm_enabled() ?
+ "Host doesn't support requested features" :
+ "TCG doesn't support requested features");
+ goto out;
}
#ifndef CONFIG_USER_ONLY
--
1.8.4.5
- [Qemu-devel] [PULL 00/19] QOM CPUState patch queue 2014-06-26, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 01/19] target-i386: kvm: Don't enable MONITOR by default on any CPU model, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 12/19] target-i386: Support check/enforce flags in TCG mode, too,
Andreas Färber <=
- [Qemu-devel] [PULL 03/19] target-i386: Merge feature filtering/checking functions, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 02/19] target-i386: Simplify reporting of unavailable features, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 06/19] target-i386: Make TCG feature filtering more readable, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 07/19] target-i386: Filter FEAT_7_0_EBX TCG features too, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 09/19] target-i386: Define TCG_*_FEATURES earlier in cpu.c, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 05/19] target-i386: Isolate KVM-specific code on CPU feature filtering logic, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 10/19] target-i386: Loop-based copying and setting/unsetting of feature words, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 04/19] target-i386: Pass FeatureWord argument to report_unavailable_features(), Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 13/19] target-i386: Add "migratable" property to "host" CPU model, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 11/19] target-i386: Loop-based feature word filtering in TCG mode, Andreas Färber, 2014/06/25