diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2017-08-24 18:31:39 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-09-01 11:54:24 -0300 |
| commit | a69773122b55961ee2dd3afd87b8321564bfe3a8 (patch) | |
| tree | bdd7bfe9e35169526f922c6e0725159e72761a4c | |
| parent | 8e36271b9246a088007ee93ff065ea5db611f900 (diff) | |
tricore: replace cpu_tricore_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-17-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | hw/tricore/tricore_testboard.c | 2 | ||||
| -rw-r--r-- | target/tricore/cpu.h | 4 | ||||
| -rw-r--r-- | target/tricore/helper.c | 5 |
3 files changed, 2 insertions, 9 deletions
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index 6c574231d5..3fcd8bb70e 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -74,7 +74,7 @@ static void tricore_testboard_init(MachineState *machine, int board_id) if (!machine->cpu_model) { machine->cpu_model = "tc1796"; } - cpu = cpu_tricore_init(machine->cpu_model); + cpu = TRICORE_CPU(cpu_generic_init(TYPE_TRICORE_CPU, machine->cpu_model)); if (!cpu) { error_report("Unable to find CPU definition"); exit(1); diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index a3493a123c..bc53c40774 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -411,9 +411,7 @@ static inline void cpu_get_tb_cpu_state(CPUTriCoreState *env, target_ulong *pc, *flags = 0; } -TriCoreCPU *cpu_tricore_init(const char *cpu_model); - -#define cpu_init(cpu_model) CPU(cpu_tricore_init(cpu_model)) +#define cpu_init(cpu_model) cpu_generic_init(TYPE_TRICORE_CPU, cpu_model) /* helpers.c */ diff --git a/target/tricore/helper.c b/target/tricore/helper.c index 3118905eca..378c2a4a76 100644 --- a/target/tricore/helper.c +++ b/target/tricore/helper.c @@ -78,11 +78,6 @@ int cpu_tricore_handle_mmu_fault(CPUState *cs, target_ulong address, return ret; } -TriCoreCPU *cpu_tricore_init(const char *cpu_model) -{ - return TRICORE_CPU(cpu_generic_init(TYPE_TRICORE_CPU, cpu_model)); -} - static void tricore_cpu_list_entry(gpointer data, gpointer user_data) { ObjectClass *oc = data; |