From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQmC9-0006nU-4k for qemu-devel@nongnu.org; Tue, 23 Oct 2012 17:39:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQmC8-0004Te-6Y for qemu-devel@nongnu.org; Tue, 23 Oct 2012 17:39:29 -0400 Received: from [206.225.164.222] (port=41522 helo=hub021-nj-6.exch021.serverdata.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQmC8-0004RG-2P for qemu-devel@nongnu.org; Tue, 23 Oct 2012 17:39:28 -0400 Message-ID: <50870E85.6010801@CloudSwitch.Com> Date: Tue, 23 Oct 2012 17:39:17 -0400 From: Don Slutz MIME-Version: 1.0 References: <1350918203-25198-1-git-send-email-imammedo@redhat.com> <1350918203-25198-16-git-send-email-imammedo@redhat.com> In-Reply-To: <1350918203-25198-16-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [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: Igor Mammedov Cc: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, blauwirbel@gmail.com, stefanha@redhat.com, pbonzini@redhat.com, afaerber@suse.de On 10/22/12 11:03, Igor Mammedov wrote: > 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) { Reviewed-by: Don Slutz