[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 27/29] openrisc: replace cpu_openrisc_init() with cpu
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 27/29] openrisc: replace cpu_openrisc_init() with cpu_generic_init() |
Date: |
Fri, 1 Sep 2017 12:03:15 -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>
Acked-by: Stafford Horne <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target/openrisc/cpu.h | 4 +---
hw/openrisc/openrisc_sim.c | 2 +-
target/openrisc/cpu.c | 5 -----
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h
index 2721432c4f..f51b89a11c 100644
--- a/target/openrisc/cpu.h
+++ b/target/openrisc/cpu.h
@@ -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"
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index e1eeffc490..243d8020db 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -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);
diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c
index 1d6330cbcc..a979f0bf8b 100644
--- a/target/openrisc/cpu.c
+++ b/target/openrisc/cpu.c
@@ -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)
{
--
2.13.5
- [Qemu-devel] [PULL 17/29] nios2: replace cpu_nios2_init() with cpu_generic_init(), (continued)
- [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, 2017/09/01
- [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 <=
- [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