[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/29] moxie: replace cpu_moxie_init() with cpu_gener
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 26/29] moxie: replace cpu_moxie_init() with cpu_generic_init() |
Date: |
Fri, 1 Sep 2017 12:03:14 -0300 |
From: Igor Mammedov <address@hidden>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target/moxie/cpu.h | 3 +--
hw/moxie/moxiesim.c | 2 +-
target/moxie/cpu.c | 5 -----
3 files changed, 2 insertions(+), 8 deletions(-)
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
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 = {
--
2.13.5
- [Qemu-devel] [PULL 12/29] s390x: replace cpu_s390x_init() with cpu_generic_init(), (continued)
- [Qemu-devel] [PULL 12/29] s390x: replace cpu_s390x_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 13/29] alpha: replace cpu_alpha_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 15/29] m68k: replace cpu_m68k_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 16/29] microblaze: replace cpu_mb_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 17/29] nios2: replace cpu_nios2_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 19/29] xtensa: replace cpu_xtensa_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 20/29] tricore: replace cpu_tricore_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 18/29] tilegx: replace cpu_tilegx_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 21/29] sh4: replace cpu_sh4_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 23/29] cris: replace cpu_cris_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 26/29] moxie: replace cpu_moxie_init() with cpu_generic_init(),
Eduardo Habkost <=
- [Qemu-devel] [PULL 22/29] arm: replace cpu_arm_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 24/29] x86: replace cpu_x86_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 25/29] lm32: replace cpu_lm32_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 27/29] openrisc: replace cpu_openrisc_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 28/29] unicore32: replace uc32_cpu_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 29/29] ppc: replace cpu_ppc_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- Re: [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01, Peter Maydell, 2017/09/04