From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48294) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGyJV-0005z4-LV for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGyJP-0004Qa-Av for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11902) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGyJP-0004QG-2q for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:27 -0400 From: Igor Mammedov Date: Wed, 26 Sep 2012 22:32:56 +0200 Message-Id: <1348691578-17231-21-git-send-email-imammedo@redhat.com> In-Reply-To: <1348691578-17231-1-git-send-email-imammedo@redhat.com> References: <1348691578-17231-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 20/22] target-i386: move init of "hypervisor" feature into CPU initializer from cpudef List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, Don@CloudSwitch.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, stefanha@linux.vnet.ibm.com "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 | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 759268d..c2e093d 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1313,6 +1313,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 = 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. @@ -1431,8 +1432,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)) { -- 1.7.1