Commit 701e3c78 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

arm: replace cpu_arm_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>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-19-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 66b79775

hw/arm/musicpal.c

+1 −1
Original line number Diff line number Diff line
@@ -1593,7 +1593,7 @@ static void musicpal_init(MachineState *machine) 
    if (!cpu_model) {

        cpu_model = "arm926";

    }

    cpu = cpu_arm_init(cpu_model);

    cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, cpu_model));

    if (!cpu) {

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

        exit(1);

hw/arm/omap1.c

+1 −1
Original line number Diff line number Diff line
@@ -3863,7 +3863,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory, 


    /* Core */

    s->mpu_model = omap310;

    s->cpu = cpu_arm_init(core);

    s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, core));

    if (s->cpu == NULL) {

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

        exit(1);

hw/arm/omap2.c

+1 −1
Original line number Diff line number Diff line
@@ -2261,7 +2261,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, 


    /* Core */

    s->mpu_model = omap2420;

    s->cpu = cpu_arm_init(core ?: "arm1136-r2");

    s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, core ?: "arm1136-r2"));

    if (s->cpu == NULL) {

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

        exit(1);

hw/arm/pxa2xx.c

+2 −2
Original line number Diff line number Diff line
@@ -2066,7 +2066,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, 
    if (!revision)

        revision = "pxa270";



    s->cpu = cpu_arm_init(revision);

    s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, revision));

    if (s->cpu == NULL) {

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

        exit(1);
@@ -2196,7 +2196,7 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) 


    s = g_new0(PXA2xxState, 1);



    s->cpu = cpu_arm_init("pxa255");

    s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, "pxa255"));

    if (s->cpu == NULL) {

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

        exit(1);

hw/arm/strongarm.c

+1 −1
Original line number Diff line number Diff line
@@ -1597,7 +1597,7 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, 
        exit(1);

    }



    s->cpu = cpu_arm_init(rev);

    s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, rev));



    if (!s->cpu) {

        error_report("Unable to find CPU definition");