Re: [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init()

[Philippe Mathieu-Daudé]

On 08/18/2017 07:08 AM, Igor Mammedov wrote:
> it's just a wrapper, drop it and use cpu_generic_init() directly
>
> Signed-off-by: Igor Mammedov <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>

> ---
> CC: Fabien Chouteau <address@hidden>
> CC: Mark Cave-Ayland <address@hidden>
> CC: Artyom Tarasenko <address@hidden>
> ---
>   target/sparc/cpu.h   | 3 +--
>   hw/sparc/leon3.c     | 2 +-
>   hw/sparc/sun4m.c     | 2 +-
>   hw/sparc64/sparc64.c | 2 +-
>   target/sparc/cpu.c   | 5 -----
>   5 files changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h
> index 0e41916..b45cfb4 100644
> --- a/target/sparc/cpu.h
> +++ b/target/sparc/cpu.h
> @@ -579,7 +579,6 @@ void cpu_raise_exception_ra(CPUSPARCState *, int, 
> uintptr_t) QEMU_NORETURN;
>   
>   #ifndef NO_CPU_IO_DEFS
>   /* cpu_init.c */
> -SPARCCPU *cpu_sparc_init(const char *cpu_model);
>   void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu);
>   void sparc_cpu_list(FILE *f, fprintf_function cpu_fprintf);
>   /* mmu_helper.c */
> @@ -656,7 +655,7 @@ hwaddr cpu_get_phys_page_nofault(CPUSPARCState *env, 
> target_ulong addr,
>   int cpu_sparc_signal_handler(int host_signum, void *pinfo, void *puc);
>   
>   #ifndef NO_CPU_IO_DEFS
> -#define cpu_init(cpu_model) CPU(cpu_sparc_init(cpu_model))
> +#define cpu_init(cpu_model) cpu_generic_init(TYPE_SPARC_CPU, cpu_model)
>   #endif
>   
>   #define cpu_signal_handler cpu_sparc_signal_handler
> diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
> index d5ff188..56512ec 100644
> --- a/hw/sparc/leon3.c
> +++ b/hw/sparc/leon3.c
> @@ -126,7 +126,7 @@ static void leon3_generic_hw_init(MachineState *machine)
>           cpu_model = "LEON3";
>       }
>   
> -    cpu = cpu_sparc_init(cpu_model);
> +    cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
>       if (cpu == NULL) {
>           fprintf(stderr, "qemu: Unable to find Sparc CPU definition\n");
>           exit(1);
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 89dd8a9..cf47dca 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -797,7 +797,7 @@ static void cpu_devinit(const char *cpu_model, unsigned int 
> id,
>       SPARCCPU *cpu;
>       CPUSPARCState *env;
>   
> -    cpu = cpu_sparc_init(cpu_model);
> +    cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
>       if (cpu == NULL) {
>           fprintf(stderr, "qemu: Unable to find Sparc CPU definition\n");
>           exit(1);
> diff --git a/hw/sparc64/sparc64.c b/hw/sparc64/sparc64.c
> index 4e4fdab..ecf38a4 100644
> --- a/hw/sparc64/sparc64.c
> +++ b/hw/sparc64/sparc64.c
> @@ -353,7 +353,7 @@ SPARCCPU *sparc64_cpu_devinit(const char *cpu_model,
>       if (cpu_model == NULL) {
>           cpu_model = default_cpu_model;
>       }
> -    cpu = cpu_sparc_init(cpu_model);
> +    cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
>       if (cpu == NULL) {
>           fprintf(stderr, "Unable to find Sparc CPU definition\n");
>           exit(1);
> diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
> index fd01cbf..2917021 100644
> --- a/target/sparc/cpu.c
> +++ b/target/sparc/cpu.c
> @@ -110,11 +110,6 @@ static void sparc_cpu_parse_features(const char *typename, 
> char *features,
>       cpu_legacy_parse_featurestr(typename, features, errp);
>   }
>   
> -SPARCCPU *cpu_sparc_init(const char *cpu_model)
> -{
> -    return SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
> -}
> -
>   void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu)
>   {
>   #if !defined(TARGET_SPARC64)