Re: [Qemu-devel] [PATCH 1/6] target-i386: Move error handling to end of x86_cpu_parse_featurestr()

[Paolo Bonzini]

On 07/04/2015 22:46, Eduardo Habkost wrote:
> Signed-off-by: Eduardo Habkost <address@hidden>
> ---
>  target-i386/cpu.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 03b33cf..f83d586 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -1961,8 +1961,7 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char 
> *features,
>              object_property_parse(OBJECT(cpu), "on", featurestr, &local_err);
>          }
>          if (local_err) {
> -            error_propagate(errp, local_err);
> -            return;
> +            goto out;
>          }
>          featurestr = strtok(NULL, ",");
>      }
> @@ -1978,6 +1977,11 @@ static void x86_cpu_parse_featurestr(CPUState *cs, 
> char *features,
>          env->features[w] |= plus_features[w];
>          env->features[w] &= ~minus_features[w];
>      }
> +
> +out:
> +    if (local_err) {
> +        error_propagate(errp, local_err);
> +    }
>  }
>  
>  /* Print all cpuid feature names in featureset
> 

Reviewed-by: Paolo Bonzini <address@hidden>