[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/22] target-i386: move default init of cpuid_kvm_f
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 21/22] target-i386: move default init of cpuid_kvm_features bitmap into CPU initializer from cpudef |
Date: |
Fri, 7 Sep 2012 22:55:10 +0200 |
Moving it inside CPU initializer from cpudef will help to split
cpu_x86_find_by_name() into default init and user settable properties.
[ehabkost: rebase on top of latest qemu.git master, where the bitmap
initialization is now different]
[imammedo: fix whitespace
Signed-off-by: Igor Mammedov <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index fe67823..6063904 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1314,6 +1314,18 @@ static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t
*def, Error **errp)
env->cpuid_7_0_ebx = def->cpuid_7_0_ebx_features;
env->cpuid_xlevel2 = def->xlevel2;
+#if defined(CONFIG_KVM)
+ env->cpuid_kvm_features = (1 << KVM_FEATURE_CLOCKSOURCE) |
+ (1 << KVM_FEATURE_NOP_IO_DELAY) |
+ (1 << KVM_FEATURE_MMU_OP) |
+ (1 << KVM_FEATURE_CLOCKSOURCE2) |
+ (1 << KVM_FEATURE_ASYNC_PF) |
+ (1 << KVM_FEATURE_STEAL_TIME) |
+ (1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT);
+#else
+ env->cpuid_kvm_features = 0;
+#endif
+
object_property_set_bool(OBJECT(cpu), true, "hypervisor", errp);
}
@@ -1389,7 +1401,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t
*x86_cpu_def,
{
x86_def_t *def;
- CPUX86State *env = &cpu->env;
QDict *features = NULL;
char *name = NULL;
@@ -1411,18 +1422,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t
*x86_cpu_def,
cpudef_2_x86_cpu(cpu, x86_cpu_def, errp);
-#if defined(CONFIG_KVM)
- env->cpuid_kvm_features = (1 << KVM_FEATURE_CLOCKSOURCE) |
- (1 << KVM_FEATURE_NOP_IO_DELAY) |
- (1 << KVM_FEATURE_MMU_OP) |
- (1 << KVM_FEATURE_CLOCKSOURCE2) |
- (1 << KVM_FEATURE_ASYNC_PF) |
- (1 << KVM_FEATURE_STEAL_TIME) |
- (1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT);
-#else
- env->cpuid_kvm_features = 0;
-#endif
-
cpu_x86_set_props(cpu, features, errp);
QDECREF(features);
if (error_is_set(errp)) {
--
1.7.11.4
- [Qemu-devel] [PATCH 06/22] target-i386: xlevel should be more than 0x80000000, move fixup into setter, (continued)
[Qemu-devel] [PATCH 18/22] target-i386: parse cpu_model string into set of stringified properties, Igor Mammedov, 2012/09/07
[Qemu-devel] [PATCH 09/22] target-i386: convert 'hv_spinlocks' feature into property, Igor Mammedov, 2012/09/07
[Qemu-devel] [PATCH 21/22] target-i386: move default init of cpuid_kvm_features bitmap into CPU initializer from cpudef,
Igor Mammedov <=
[Qemu-devel] [PATCH 16/22] target-i386: use define for cpuid vendor string size, Igor Mammedov, 2012/09/07
Re: [Qemu-devel] [PATCH 00/22 v2] target-i386: convert CPU features into properties, Igor Mammedov, 2012/09/07
[Qemu-devel] [PATCH 11/22] target-i386: convert 'hv_vapic' feature into property, Igor Mammedov, 2012/09/07
[Qemu-devel] [PATCH 20/22] target-i386: move init of "hypervisor" feature into CPU initializer from cpudef, Igor Mammedov, 2012/09/07
[Qemu-devel] [PATCH 14/22] target-i386: use visit_type_hz to parse tsc_freq property value, Igor Mammedov, 2012/09/07
[Qemu-devel] [PATCH 22/22] target-i386: cleanup cpu_x86_find_by_name(), only fill x86_def_t in it, Igor Mammedov, 2012/09/07
[Qemu-devel] [PATCH 15/22] target-i386: introduce vendor-override property, Igor Mammedov, 2012/09/07
[Qemu-devel] [PATCH 19/22] target-i386: use properties to set/unset user specified features on CPU, Igor Mammedov, 2012/09/07