| Message ID | 1500040339-119465-27-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jul 14, 2017 at 03:52:17PM +0200, Igor Mammedov wrote: > 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>
On Fri, Jul 14, 2017 at 03:52:17PM +0200, Igor Mammedov wrote: > it's just a wrapper, drop it and use cpu_generic_init() directly > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > CC: Jia Liu <proljc@gmail.com> > CC: Stafford Horne <shorne@gmail.com> > --- > target/openrisc/cpu.h | 4 +--- > hw/openrisc/openrisc_sim.c | 2 +- > target/openrisc/cpu.c | 5 ----- > 3 files changed, 2 insertions(+), 9 deletions(-) Sorry, I thought I had acked this earlier. Acked-by: Stafford Horne <shorne@gmail.com>
diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index 2721432..f51b89a 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 fc0d096..d6ed968 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 1d6330c..a979f0b 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) {
it's just a wrapper, drop it and use cpu_generic_init() directly Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- CC: Jia Liu <proljc@gmail.com> CC: Stafford Horne <shorne@gmail.com> --- target/openrisc/cpu.h | 4 +--- hw/openrisc/openrisc_sim.c | 2 +- target/openrisc/cpu.c | 5 ----- 3 files changed, 2 insertions(+), 9 deletions(-)