From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJZA-0003k8-1X for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:05:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQJZ2-000170-KC for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:05:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51959) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJZ2-000164-Bn for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:05:12 -0400 From: Igor Mammedov Date: Mon, 22 Oct 2012 17:03:01 +0200 Message-Id: <1350918203-25198-16-git-send-email-imammedo@redhat.com> In-Reply-To: <1350918203-25198-1-git-send-email-imammedo@redhat.com> References: <1350918203-25198-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 15/37] target-i386: set default value of "hypervisor" feature using static property 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, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, stefanha@redhat.com, pbonzini@redhat.com, afaerber@suse.de Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 3131945..dc4fcdf 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -174,7 +174,7 @@ static Property cpu_x86_properties[] = { DEFINE_PROP_BIT("f-xsave", X86CPU, env.cpuid_ext_features, 26, false), DEFINE_PROP_BIT("f-osxsave", X86CPU, env.cpuid_ext_features, 27, false), DEFINE_PROP_BIT("f-avx", X86CPU, env.cpuid_ext_features, 28, false), - DEFINE_PROP_BIT("f-hypervisor", X86CPU, env.cpuid_ext_features, 31, false), + DEFINE_PROP_BIT("f-hypervisor", X86CPU, env.cpuid_ext_features, 31, true), DEFINE_PROP_BIT("f-syscall", X86CPU, env.cpuid_ext2_features, 11, false), DEFINE_PROP_BIT("f-nx", X86CPU, env.cpuid_ext2_features, 20, false), DEFINE_PROP_BIT("f-xd", X86CPU, env.cpuid_ext2_features, 20, false), @@ -1307,11 +1307,12 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, { unsigned int i; x86_def_t *def; + CPUX86State *env = &cpu->env; char *s = g_strdup(cpu_model); char *featurestr, *name = strtok(s, ","); /* Features to be added*/ - uint32_t plus_features = 0, plus_ext_features = 0; + uint32_t plus_features = 0, plus_ext_features = env->cpuid_ext_features; uint32_t plus_ext2_features = 0, plus_ext3_features = 0; uint32_t plus_kvm_features = 0, plus_svm_features = 0; uint32_t plus_7_0_ebx_features = 0; @@ -1345,10 +1346,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, plus_kvm_features = 0; #endif - add_flagname_to_bitmaps("hypervisor", &plus_features, - &plus_ext_features, &plus_ext2_features, &plus_ext3_features, - &plus_kvm_features, &plus_svm_features, &plus_7_0_ebx_features); - featurestr = strtok(NULL, ","); while (featurestr) { -- 1.7.11.7