mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openrisc: replace cpu_openrisc_init() with cpu_generic_init()

Browse Source 
it's just a wrapper, drop it and use cpu_generic_init() directly

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Stafford Horne <shorne@gmail.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-24-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-08-24 18:31:46 +02:00 committed by Eduardo Habkost
parent a328ad9647
commit f6f8b26095
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/openrisc/openrisc_sim.c
View File

@ -109,7 +109,7 @@ static void openrisc_sim_init(MachineState *machine)
} }
for (n = 0; n < smp_cpus; n++) { 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) { if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition!\n"); fprintf(stderr, "Unable to find CPU definition!\n");
exit(1); exit(1);

5
target/openrisc/cpu.c
View File

@ -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". */ /* Sort alphabetically by type name, except for "any". */
static gint openrisc_cpu_list_compare(gconstpointer a, gconstpointer b) static gint openrisc_cpu_list_compare(gconstpointer a, gconstpointer b)
{ {

4
target/openrisc/cpu.h
View File

@ -347,8 +347,6 @@ static inline OpenRISCCPU *openrisc_env_get_cpu(CPUOpenRISCState *env)
#define ENV_OFFSET offsetof(OpenRISCCPU, 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 cpu_openrisc_list(FILE *f, fprintf_function cpu_fprintf);
void openrisc_cpu_do_interrupt(CPUState *cpu); void openrisc_cpu_do_interrupt(CPUState *cpu);
bool openrisc_cpu_exec_interrupt(CPUState *cpu, int int_req); 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); int *prot, target_ulong address, int rw);
#endif #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" #include "exec/cpu-all.h"