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

openrisc: replace cpu_openrisc_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 avatarStafford Horne <shorne@gmail.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-24-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent a328ad96

hw/openrisc/openrisc_sim.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void openrisc_sim_init(MachineState *machine) 
    }



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

        cpu = cpu_openrisc_init(cpu_model);

        cpu = OPENRISC_CPU(cpu_generic_init(TYPE_OPENRISC_CPU, cpu_model));

        if (cpu == NULL) {

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

            exit(1);

target/openrisc/cpu.c

+0 −5
Original line number Diff line number Diff line
@@ -210,11 +210,6 @@ static void openrisc_cpu_register_types(void) 
    }

}



OpenRISCCPU *cpu_openrisc_init(const char *cpu_model)

{

    return OPENRISC_CPU(cpu_generic_init(TYPE_OPENRISC_CPU, cpu_model));

}



/* Sort alphabetically by type name, except for "any". */

static gint openrisc_cpu_list_compare(gconstpointer a, gconstpointer b)

{

target/openrisc/cpu.h

+1 −3
Original line number Diff line number Diff line
@@ -347,8 +347,6 @@ static inline OpenRISCCPU *openrisc_env_get_cpu(CPUOpenRISCState *env) 


#define ENV_OFFSET offsetof(OpenRISCCPU, env)



OpenRISCCPU *cpu_openrisc_init(const char *cpu_model);



void cpu_openrisc_list(FILE *f, fprintf_function cpu_fprintf);

void openrisc_cpu_do_interrupt(CPUState *cpu);

bool openrisc_cpu_exec_interrupt(CPUState *cpu, int int_req);
@@ -390,7 +388,7 @@ int cpu_openrisc_get_phys_data(OpenRISCCPU *cpu, 
                               int *prot, target_ulong address, int rw);

#endif



#define cpu_init(cpu_model) CPU(cpu_openrisc_init(cpu_model))

#define cpu_init(cpu_model) cpu_generic_init(TYPE_OPENRISC_CPU, cpu_model)



#include "exec/cpu-all.h"