diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2017-08-24 18:31:45 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-09-01 11:54:25 -0300 |
| commit | a328ad964774ce3043dade8c9870139f127a3372 (patch) | |
| tree | 22deb63bb4c8ff2bef35cb4cf303c1b731be746a | |
| parent | 1d197417a31d74b5b875addd1837343e3ea7d5f2 (diff) | |
| download | qemu-a328ad964774ce3043dade8c9870139f127a3372.zip qemu-a328ad964774ce3043dade8c9870139f127a3372.tar.gz qemu-a328ad964774ce3043dade8c9870139f127a3372.tar.bz2 | |
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 <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-23-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | hw/moxie/moxiesim.c | 2 | ||||
| -rw-r--r-- | target/moxie/cpu.c | 5 | ||||
| -rw-r--r-- | 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 df3f124..4c27b45 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 927b1a1..748d02f 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 8991aae..75decaa 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 |