Commit c4c8146c authored by Igor Mammedov's avatar Igor Mammedov Committed by Yongbok Kim
Browse files

mips: replace cpu_mips_init() with cpu_generic_init() 



now cpu_mips_init() reimplements subset of cpu_generic_init()
tasks, so just drop it and use cpu_generic_init() directly.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
[PMD: use internal.h instead of cpu.h]
Tested-by: default avatarJames Hogan <james.hogan@imgtec.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarYongbok Kim <yongbok.kim@imgtec.com>
parent 41da212c

hw/mips/cps.c

+1 −1
Original line number Diff line number Diff line
@@ -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));



        /* Init internal devices */

        cpu_mips_irq_init_cpu(cpu);

hw/mips/mips_fulong2e.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,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));

    env = &cpu->env;



    qemu_register_reset(main_cpu_reset, cpu);

hw/mips/mips_jazz.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

    env = &cpu->env;

    qemu_register_reset(main_cpu_reset, cpu);

hw/mips/mips_malta.c

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,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));



        /* Init internal devices */

        cpu_mips_irq_init_cpu(cpu);

hw/mips/mips_mipssim.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,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));

    env = &cpu->env;



    reset_info = g_malloc0(sizeof(ResetData));