Patchwork [21/23] target-i386: move init of "hypervisor" feature into CPU initializer from cpudef

login
register
mail settings
Submitter Igor Mammedov
Date Oct. 2, 2012, 3:37 p.m.
Message ID <1349192235-31895-22-git-send-email-imammedo@redhat.com>
Download mbox | patch
Permalink /patch/188556/
State New
Headers show

Comments

Igor Mammedov - Oct. 2, 2012, 3:37 p.m.
"hypervisor" CPU feature is unconditionally enabled/overridden even if it's cleared
in cpudef. Moving it inside CPU initializer from cpudef will help to
split cpu_x86_find_by_name() into default init and user settable properties.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 target-i386/cpu.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Patch

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 22a1ded..dbaa002 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1322,6 +1322,7 @@  static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp)
     env->cpuid_ext4_features = def->ext4_features;
     env->cpuid_7_0_ebx_features = def->cpuid_7_0_ebx_features;
     env->cpuid_xlevel2 = def->xlevel2;
+    object_property_set_bool(OBJECT(cpu), true, "hypervisor", errp);
 
     /* On AMD CPUs, some CPUID[8000_0001].EDX bits must match the bits on
      * CPUID[1].EDX.
@@ -1439,8 +1440,6 @@  static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def,
     env->cpuid_kvm_features = 0;
 #endif
 
-    object_property_set_bool(OBJECT(cpu), true, "hypervisor", errp);
-
     cpu_x86_set_props(cpu, features, errp);
     QDECREF(features);
     if (error_is_set(errp)) {