Commit 84efa64c authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

ppc: replace cpu_ppc_init() with cpu_generic_init() 



it's just a wrapper, drop it and use cpu_generic_init() directly

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-26-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 13b884e1

hw/ppc/e500.c

+2 −1
Original line number Diff line number Diff line
@@ -819,7 +819,8 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) 
        CPUState *cs;

        qemu_irq *input;



        cpu = cpu_ppc_init(machine->cpu_model);

        cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,

                                           machine->cpu_model));

        if (cpu == NULL) {

            fprintf(stderr, "Unable to initialize CPU!\n");

            exit(1);

hw/ppc/mac_newworld.c

+2 −1
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ static void ppc_core99_init(MachineState *machine) 
#endif

    }

    for (i = 0; i < smp_cpus; i++) {

        cpu = cpu_ppc_init(machine->cpu_model);

        cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,

                                           machine->cpu_model));

        if (cpu == NULL) {

            fprintf(stderr, "Unable to find PowerPC CPU definition\n");

            exit(1);

hw/ppc/mac_oldworld.c

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ static void ppc_heathrow_init(MachineState *machine) 
    if (machine->cpu_model == NULL)

        machine->cpu_model = "G3";

    for (i = 0; i < smp_cpus; i++) {

        cpu = cpu_ppc_init(machine->cpu_model);

        cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,

                                           machine->cpu_model));

        if (cpu == NULL) {

            fprintf(stderr, "Unable to find PowerPC CPU definition\n");

            exit(1);

hw/ppc/ppc440_bamboo.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void bamboo_init(MachineState *machine) 
    if (machine->cpu_model == NULL) {

        machine->cpu_model = "440EP";

    }

    cpu = cpu_ppc_init(machine->cpu_model);

    cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, machine->cpu_model));

    if (cpu == NULL) {

        fprintf(stderr, "Unable to initialize CPU!\n");

        exit(1);

hw/ppc/ppc4xx_devs.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ PowerPCCPU *ppc4xx_init(const char *cpu_model, 
    CPUPPCState *env;



    /* init CPUs */

    cpu = cpu_ppc_init(cpu_model);

    cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model));

    if (cpu == NULL) {

        fprintf(stderr, "Unable to find PowerPC %s CPU definition\n",

                cpu_model);