Re: [Qemu-devel] [PATCH 01/20] target-i386: filter out not TCG features if running without kvm at realize time

[Eduardo Habkost]

On Thu, Dec 27, 2012 at 08:15:18PM +0100, Igor Mammedov wrote:
> On Thu, 27 Dec 2012 16:41:47 -0200
> Eduardo Habkost <address@hidden> wrote:
> 
> > On Thu, Dec 27, 2012 at 03:59:17PM +0100, Igor Mammedov wrote:
> > > Signed-off-by: Igor Mammedov <address@hidden>
> > > Reviewed-by: Eduardo Habkost <address@hidden>
> > > Signed-off-by: Eduardo Habkost <address@hidden>
> > 
> > Patch is OK, but Subject line needs to be fixed. You are moving the
> > filtering for both KVM and non-KVM cases, not just the TCG filtering.
> would be "target-i386: filter out features at realize time" acceptable?

That's OK to me. Maybe "target-i386: filter out unsupported features at
realize time" to explain what kind of filtering it is.

> 
> > 
> > > ---
> > >  target-i386/cpu.c |   31 ++++++++++++++++---------------
> > >  1 files changed, 16 insertions(+), 15 deletions(-)
> > > 
> > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> > > index 7be3ad8..63aae86 100644
> > > --- a/target-i386/cpu.c
> > > +++ b/target-i386/cpu.c
> > > @@ -1549,21 +1549,6 @@ int cpu_x86_register(X86CPU *cpu, const char 
> > > *cpu_model)
> > >          env->cpuid_ext2_features |= (def->features & 
> > > CPUID_EXT2_AMD_ALIASES);
> > >      }
> > >  
> > > -    if (!kvm_enabled()) {
> > > -        env->cpuid_features &= TCG_FEATURES;
> > > -        env->cpuid_ext_features &= TCG_EXT_FEATURES;
> > > -        env->cpuid_ext2_features &= (TCG_EXT2_FEATURES
> > > -#ifdef TARGET_X86_64
> > > -            | CPUID_EXT2_SYSCALL | CPUID_EXT2_LM
> > > -#endif
> > > -            );
> > > -        env->cpuid_ext3_features &= TCG_EXT3_FEATURES;
> > > -        env->cpuid_svm_features &= TCG_SVM_FEATURES;
> > > -    } else {
> > > -#ifdef CONFIG_KVM
> > > -        filter_features_for_kvm(cpu);
> > > -#endif
> > > -    }
> > >      object_property_set_str(OBJECT(cpu), def->model_id, "model-id", 
> > > &error);
> > >      if (error) {
> > >          fprintf(stderr, "%s\n", error_get_pretty(error));
> > > @@ -2077,6 +2062,22 @@ void x86_cpu_realize(Object *obj, Error **errp)
> > >          env->cpuid_level = 7;
> > >      }
> > >  
> > > +    if (!kvm_enabled()) {
> > > +        env->cpuid_features &= TCG_FEATURES;
> > > +        env->cpuid_ext_features &= TCG_EXT_FEATURES;
> > > +        env->cpuid_ext2_features &= (TCG_EXT2_FEATURES
> > > +#ifdef TARGET_X86_64
> > > +            | CPUID_EXT2_SYSCALL | CPUID_EXT2_LM
> > > +#endif
> > > +            );
> > > +        env->cpuid_ext3_features &= TCG_EXT3_FEATURES;
> > > +        env->cpuid_svm_features &= TCG_SVM_FEATURES;
> > > +    } else {
> > > +#ifdef CONFIG_KVM
> > > +        filter_features_for_kvm(cpu);
> > > +#endif
> > > +    }
> > > +
> > >  #ifndef CONFIG_USER_ONLY
> > >      qemu_register_reset(x86_cpu_machine_reset_cb, cpu);
> > >  
> > > -- 
> > > 1.7.1
> > > 
> > 
> > -- 
> > Eduardo
> 
> 
> -- 
> Regards,
>   Igor

-- 
Eduardo