From a328ad964774ce3043dade8c9870139f127a3372 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Thu, 24 Aug 2017 18:31:45 +0200 Subject: [PATCH] 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: Igor Mammedov Reviewed-by: Eduardo Habkost Message-Id: <1503592308-93913-23-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost --- hw/moxie/moxiesim.c | 2 +- target/moxie/cpu.c | 5 ----- target/moxie/cpu.h | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index df3f1249ae..4c27b45c46 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -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); diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c index 927b1a1e44..748d02f29e 100644 --- a/target/moxie/cpu.c +++ b/target/moxie/cpu.c @@ -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 = { diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h index 8991aaef9a..75decaadd6 100644 --- a/target/moxie/cpu.h +++ b/target/moxie/cpu.h @@ -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 -- 2.11.4.GIT