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

moxie: replace cpu_moxie_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 avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-23-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 1d197417

hw/moxie/moxiesim.c

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

        cpu_model = "MoxieLite-moxie-cpu";

    }

    cpu = cpu_moxie_init(cpu_model);

    cpu = MOXIE_CPU(cpu_generic_init(TYPE_MOXIE_CPU, cpu_model));

    if (!cpu) {

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

        exit(1);

target/moxie/cpu.c

+0 −5
Original line number Diff line number Diff line
@@ -150,11 +150,6 @@ static const MoxieCPUInfo moxie_cpus[] = { 
    { .name = "any",            .initfn = moxie_any_initfn },

};



MoxieCPU *cpu_moxie_init(const char *cpu_model)

{

    return MOXIE_CPU(cpu_generic_init(TYPE_MOXIE_CPU, cpu_model));

}



static void cpu_register(const MoxieCPUInfo *info)

{

    TypeInfo type_info = {

target/moxie/cpu.h

+1 −2
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ static inline MoxieCPU *moxie_env_get_cpu(CPUMoxieState *env) 


#define ENV_OFFSET offsetof(MoxieCPU, env)



MoxieCPU *cpu_moxie_init(const char *cpu_model);

void moxie_cpu_do_interrupt(CPUState *cs);

void moxie_cpu_dump_state(CPUState *cpu, FILE *f,

                          fprintf_function cpu_fprintf, int flags);
@@ -121,7 +120,7 @@ void moxie_translate_init(void); 
int cpu_moxie_signal_handler(int host_signum, void *pinfo,

                             void *puc);



#define cpu_init(cpu_model) CPU(cpu_moxie_init(cpu_model))

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



#define cpu_signal_handler cpu_moxie_signal_handler