From patchwork Fri Sep 7 20:55:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [20/22] target-i386: move init of "hypervisor" feature into CPU initializer from cpudef From: Igor Mammedov X-Patchwork-Id: 182456 Message-Id: <1347051311-16122-21-git-send-email-imammedo@redhat.com> To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, jan.kiszka@siemens.com, mdroth@linux.vnet.ibm.com, don.slutz@gmail.com, blauwirbel@gmail.com, avi@redhat.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, ehabkost@redhat.com Date: Fri, 7 Sep 2012 22:55:09 +0200 "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 --- target-i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index be1be84..fe67823 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1313,6 +1313,8 @@ 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 = def->cpuid_7_0_ebx_features; env->cpuid_xlevel2 = def->xlevel2; + + object_property_set_bool(OBJECT(cpu), true, "hypervisor", errp); } /* convert legacy cpumodel string to string cpu_name and @@ -1421,8 +1423,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)) {