[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 05/18] target-i386: Isolate KVM-specific code on
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v4 05/18] target-i386: Isolate KVM-specific code on CPU feature filtering logic |
Date: |
Wed, 30 Apr 2014 13:48:32 -0300 |
This will allow us to re-use the feature filtering logic (and the
check/enforce flag logic) for TCG.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes v1 -> v2:
* Trivial rebase to latest qom-cpu (commit 90c5d39c)
(Reviewed-by line kept)
Changes v2 -> v3:
* Trivial rebase after QEMU 2.0 (onto commit 2d03b49)
(Reviewed-by line kept)
---
target-i386/cpu.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index f37ed40..72b2d95 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1813,26 +1813,29 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error
**errp)
return cpu_list;
}
+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);
+}
+
/* Filters CPU feature words based on host availability of each feature
*
* Returns 0 if all flags are supported by the host, non-zero otherwise.
*
* This function may be called only if KVM is enabled.
*/
-static int filter_features_for_kvm(X86CPU *cpu)
+static int x86_cpu_filter_features(X86CPU *cpu)
{
CPUX86State *env = &cpu->env;
- KVMState *s = kvm_state;
FeatureWord w;
int rv = 0;
- assert(kvm_enabled());
-
for (w = 0; w < FEATURE_WORDS; w++) {
- FeatureWordInfo *wi = &feature_word_info[w];
- uint32_t host_feat = kvm_arch_get_supported_cpuid(s, wi->cpuid_eax,
- wi->cpuid_ecx,
- wi->cpuid_reg);
+ uint32_t host_feat = x86_cpu_get_supported_feature_word(w);
uint32_t requested_features = env->features[w];
env->features[w] &= host_feat;
cpu->filtered_features[w] = requested_features & ~env->features[w];
@@ -2593,7 +2596,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error
**errp)
env->features[FEAT_8000_0001_ECX] &= TCG_EXT3_FEATURES;
env->features[FEAT_SVM] &= TCG_SVM_FEATURES;
} else {
- if (filter_features_for_kvm(cpu) && cpu->enforce_cpuid) {
+ if (x86_cpu_filter_features(cpu) && cpu->enforce_cpuid) {
error_setg(&local_err,
"Host's CPU doesn't support requested features");
goto out;
--
1.9.0
- [Qemu-devel] [PATCH v4 00/18] target-i386: CPU feature flag queue, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 10/18] target-i386: Loop-based copying and setting/unsetting of feature words, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 09/18] target-i386: Define TCG_*_FEATURES earlier on cpu.c, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 12/18] target-i386: Support check/enforce flags in TCG mode, too, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 11/18] target-i386: Loop-based feature word filtering in TCG mode, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 13/18] target-i386: Support "-cpu host" in TCG mode, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 17/18] target-i386: block migration and savevm if invariant tsc is exposed, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 06/18] target-i386: Make TCG feature filtering more readable, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 05/18] target-i386: Isolate KVM-specific code on CPU feature filtering logic,
Eduardo Habkost <=
- [Qemu-devel] [PATCH v4 03/18] target-i386: Merge feature filtering/checking functions, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 08/18] target-i386: Filter KVM and 0xC0000001 features on TCG, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 02/18] target-i386: Simplify reporting of unavailable features, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 04/18] target-i386: Pass FeatureWord argument to report_unavailable_features(), Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 07/18] target-i386: Filter FEAT_7_0_EBX TCG features too, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 14/18] target-i386: Add "migratable" property to "host" CPU model, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 16/18] savevm: check vmsd for migratability status, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 18/18] target-i386: support "invariant tsc" flag, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 15/18] target-i386: Set migratable=yes by default, Eduardo Habkost, 2014/04/30
- [Qemu-devel] [PATCH v4 01/18] target-i386: kvm: Don't enable MONITOR by default on any CPU model, Eduardo Habkost, 2014/04/30