Re: [Qemu-devel] [PATCH 03/28] mips: replace cpu_mips_init() with cpu_generic_init()

[Philippe Mathieu-Daudé]

On 07/14/2017 10:51 AM, Igor Mammedov wrote:
> now cpu_mips_init() reimplements subset of cpu_generic_init()
> tasks, so just drop it and use cpu_generic_init() directly.
>
> Signed-off-by: Igor Mammedov <address@hidden>

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

> ---
> CC: Aurelien Jarno <address@hidden>
> CC: Yongbok Kim <address@hidden>
> CC: "Hervé Poussineau" <address@hidden>
> ---
>   target/mips/cpu.h       |  3 +--
>   hw/mips/cps.c           |  2 +-
>   hw/mips/mips_fulong2e.c |  2 +-
>   hw/mips/mips_jazz.c     |  2 +-
>   hw/mips/mips_malta.c    |  2 +-
>   hw/mips/mips_mipssim.c  |  2 +-
>   hw/mips/mips_r4k.c      |  2 +-
>   target/mips/translate.c | 17 -----------------
>   8 files changed, 7 insertions(+), 25 deletions(-)
>
> diff --git a/target/mips/cpu.h b/target/mips/cpu.h
> index 7c2e0bf..efc8025 100644
> --- a/target/mips/cpu.h
> +++ b/target/mips/cpu.h
> @@ -865,10 +865,9 @@ enum {
>   #define CPU_INTERRUPT_WAKE CPU_INTERRUPT_TGT_INT_0
>   
>   void mips_tcg_init(void);
> -MIPSCPU *cpu_mips_init(const char *cpu_model);
>   int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);
>   
> -#define cpu_init(cpu_model) CPU(cpu_mips_init(cpu_model))
> +#define cpu_init(cpu_model) cpu_generic_init(TYPE_MIPS_CPU, cpu_model)
>   bool cpu_supports_cps_smp(const char *cpu_model);
>   bool cpu_supports_isa(const char *cpu_model, unsigned int isa);
>   void cpu_set_exception_base(int vp_index, target_ulong address);
> diff --git a/hw/mips/cps.c b/hw/mips/cps.c
> index 4ef337d..708899c 100644
> --- a/hw/mips/cps.c
> +++ b/hw/mips/cps.c
> @@ -71,7 +71,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
>       bool itu_present = false;
>   
>       for (i = 0; i < s->num_vp; i++) {
> -        cpu = cpu_mips_init(s->cpu_model);
> +        cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, s->cpu_model));
>           if (cpu == NULL) {
>               error_setg(errp, "%s: CPU initialization failed",  __func__);
>               return;
> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
> index dbe2805..02a1712 100644
> --- a/hw/mips/mips_fulong2e.c
> +++ b/hw/mips/mips_fulong2e.c
> @@ -277,7 +277,7 @@ static void mips_fulong2e_init(MachineState *machine)
>       if (cpu_model == NULL) {
>           cpu_model = "Loongson-2E";
>       }
> -    cpu = cpu_mips_init(cpu_model);
> +    cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));
>       if (cpu == NULL) {
>           fprintf(stderr, "Unable to find CPU definition\n");
>           exit(1);
> diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
> index 1cef581..ee58c44 100644
> --- a/hw/mips/mips_jazz.c
> +++ b/hw/mips/mips_jazz.c
> @@ -151,7 +151,7 @@ static void mips_jazz_init(MachineState *machine,
>       if (cpu_model == NULL) {
>           cpu_model = "R4000";
>       }
> -    cpu = cpu_mips_init(cpu_model);
> +    cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));
>       if (cpu == NULL) {
>           fprintf(stderr, "Unable to find CPU definition\n");
>           exit(1);
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index 95cdabb..21dd2c3 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -928,7 +928,7 @@ static void create_cpu_without_cps(const char *cpu_model,
>       int i;
>   
>       for (i = 0; i < smp_cpus; i++) {
> -        cpu = cpu_mips_init(cpu_model);
> +        cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));
>           if (cpu == NULL) {
>               fprintf(stderr, "Unable to find CPU definition\n");
>               exit(1);
> diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
> index 1b91195..80e2bab 100644
> --- a/hw/mips/mips_mipssim.c
> +++ b/hw/mips/mips_mipssim.c
> @@ -162,7 +162,7 @@ mips_mipssim_init(MachineState *machine)
>           cpu_model = "24Kf";
>   #endif
>       }
> -    cpu = cpu_mips_init(cpu_model);
> +    cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));
>       if (cpu == NULL) {
>           fprintf(stderr, "Unable to find CPU definition\n");
>           exit(1);
> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
> index f4de9fc..81dba5e 100644
> --- a/hw/mips/mips_r4k.c
> +++ b/hw/mips/mips_r4k.c
> @@ -191,7 +191,7 @@ void mips_r4k_init(MachineState *machine)
>           cpu_model = "24Kf";
>   #endif
>       }
> -    cpu = cpu_mips_init(cpu_model);
> +    cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));
>       if (cpu == NULL) {
>           fprintf(stderr, "Unable to find CPU definition\n");
>           exit(1);
> diff --git a/target/mips/translate.c b/target/mips/translate.c
> index ae7ca80..ad4242f 100644
> --- a/target/mips/translate.c
> +++ b/target/mips/translate.c
> @@ -20191,23 +20191,6 @@ void mips_tcg_init(void)
>   
>   #include "translate_init.c"
>   
> -MIPSCPU *cpu_mips_init(const char *cpu_model)
> -{
> -    ObjectClass *oc;
> -    MIPSCPU *cpu;
> -
> -    oc = cpu_class_by_name(TYPE_MIPS_CPU, cpu_model);
> -    if (oc == NULL) {
> -        return NULL;
> -    }
> -
> -    cpu = MIPS_CPU(object_new(object_class_get_name(oc)));
> -
> -    object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
> -
> -    return cpu;
> -}
> -
>   bool cpu_supports_cps_smp(const char *cpu_model)
>   {
>       const mips_def_t *def = cpu_mips_find_by_name(cpu_model);