Re: [Qemu-devel] [PATCH 01/17] target-i386: move setting defaults out of cpu_x86_parse_featurestr()

[Eduardo Habkost]

On Fri, Jan 11, 2013 at 03:10:15AM +0100, Igor Mammedov wrote:
> No functional change, needed for simplifying conversion to properties.
> 
> Signed-off-by: Igor Mammedov <address@hidden>

Reviewed-by: Eduardo Habkost <address@hidden>

> ---
>  v2:
>   - rebased on top of "disable kvm_mmu + -cpu "enforce" fixes (v3)"
> ---
>  target-i386/cpu.c |    9 ++++-----
>  1 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 0a0a134..0f7a5eb 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -1343,15 +1343,11 @@ static int cpu_x86_parse_featurestr(x86_def_t 
> *x86_cpu_def, char *features)
>      unsigned int i;
>      char *featurestr; /* Single 'key=value" string being parsed */
>      /* Features to be added */
> -    FeatureWordArray plus_features = {
> -        [FEAT_KVM] = kvm_default_features,
> -    };
> +    FeatureWordArray plus_features = { 0 };
>      /* Features to be removed */
>      FeatureWordArray minus_features = { 0 };
>      uint32_t numvalue;
>  
> -    add_flagname_to_bitmaps("hypervisor", plus_features);
> -
>      featurestr = features ? strtok(features, ",") : NULL;
>  
>      while (featurestr) {
> @@ -1607,6 +1603,9 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
>          goto error;
>      }
>  
> +    def->kvm_features |= kvm_default_features;
> +    def->ext_features |= CPUID_EXT_HYPERVISOR;
> +
>      if (cpu_x86_parse_featurestr(def, features) < 0) {
>          goto error;
>      }
> -- 
> 1.7.1
> 

-- 
Eduardo