Re: [Qemu-ppc] [Qemu-devel] [PATCH v3 25/25] cpu: get rid of cpu_generic_init()

[Igor Mammedov]

On Tue, 23 Jan 2018 09:08:24 +0100
Igor Mammedov <address@hidden> wrote:

> There aren't any users of the helper left, remove it.
after rebase this patch nor longer does what subj says
and it should be squashed into 23/25 where cpu_generic_init() is removed,
so pls ignore this patch I'll post v4 for 23/25 with this squashed in
and actual removal of not used MachineState::cpu_model
which I've lost on rebase.

> 
> Signed-off-by: Igor Mammedov <address@hidden>
> ---
> CC: Richard Henderson <address@hidden>
> CC: "Emilio G. Cota" <address@hidden>
> CC: Paolo Bonzini <address@hidden>
> CC: Eduardo Habkost <address@hidden>
> CC: "Alex Bennée" <address@hidden>
> CC: "Philippe Mathieu-Daudé" <address@hidden>
> ---
>  qom/cpu.c | 17 ++---------------
>  1 file changed, 2 insertions(+), 15 deletions(-)
> 
> diff --git a/qom/cpu.c b/qom/cpu.c
> index aab8437..cf6880d 100644
> --- a/qom/cpu.c
> +++ b/qom/cpu.c
> @@ -304,22 +304,9 @@ static ObjectClass *cpu_common_class_by_name(const char 
> *cpu_model)
>  static void cpu_common_parse_features(const char *typename, char *features,
>                                        Error **errp)
>  {
> -    char *featurestr; /* Single "key=value" string being parsed */
>      char *val;
> -    static bool cpu_globals_initialized;
> -
> -    /* TODO: all callers of ->parse_features() need to be changed to
> -     * call it only once, so we can remove this check (or change it
> -     * to assert(!cpu_globals_initialized).
> -     * Current callers of ->parse_features() are:
> -     * - cpu_generic_init()
> -     */
> -    if (cpu_globals_initialized) {
> -        return;
> -    }
> -    cpu_globals_initialized = true;
> -
> -    featurestr = features ? strtok(features, ",") : NULL;
> +    /* Single "key=value" string being parsed */
> +    char *featurestr = features ? strtok(features, ",") : NULL;
>  
>      while (featurestr) {
>          val = strchr(featurestr, '=');