[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/28] cris: replace cpu_cris_init() with cpu_generi
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 22/28] cris: replace cpu_cris_init() with cpu_generic_init() |
Date: |
Fri, 14 Jul 2017 15:52:13 +0200 |
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <address@hidden>
---
CC: "Edgar E. Iglesias" <address@hidden>
---
target/cris/cpu.h | 3 +--
hw/cris/axis_dev88.c | 2 +-
target/cris/cpu.c | 5 -----
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/target/cris/cpu.h b/target/cris/cpu.h
index 920e1c3..5d822de 100644
--- a/target/cris/cpu.h
+++ b/target/cris/cpu.h
@@ -216,7 +216,6 @@ int crisv10_cpu_gdb_read_register(CPUState *cpu, uint8_t
*buf, int reg);
int cris_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
int cris_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
-CRISCPU *cpu_cris_init(const char *cpu_model);
/* you can call this signal handler from your SIGBUS and SIGSEGV
signal handlers to inform the virtual CPU of exceptions. non zero
is returned if the signal was handled by the virtual CPU. */
@@ -268,7 +267,7 @@ enum {
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
-#define cpu_init(cpu_model) CPU(cpu_cris_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_CRIS_CPU, cpu_model)
#define cpu_signal_handler cpu_cris_signal_handler
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 60df887..7030d18 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -271,7 +271,7 @@ void axisdev88_init(MachineState *machine)
if (cpu_model == NULL) {
cpu_model = "crisv32";
}
- cpu = cpu_cris_init(cpu_model);
+ cpu = CRIS_CPU(cpu_generic_init(TYPE_CRIS_CPU, cpu_model));
env = &cpu->env;
/* allocate RAM */
diff --git a/target/cris/cpu.c b/target/cris/cpu.c
index 5f766f0..ceebfed 100644
--- a/target/cris/cpu.c
+++ b/target/cris/cpu.c
@@ -89,11 +89,6 @@ static ObjectClass *cris_cpu_class_by_name(const char
*cpu_model)
return oc;
}
-CRISCPU *cpu_cris_init(const char *cpu_model)
-{
- return CRIS_CPU(cpu_generic_init(TYPE_CRIS_CPU, cpu_model));
-}
-
/* Sort alphabetically by VR. */
static gint cris_cpu_list_compare(gconstpointer a, gconstpointer b)
{
--
2.7.4
- [Qemu-devel] [PATCH 11/28] s390x: replace cpu_s390x_init() with cpu_generic_init(), (continued)
- [Qemu-devel] [PATCH 11/28] s390x: replace cpu_s390x_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 12/28] alpha: replace cpu_alpha_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 13/28] hppa: replace cpu_hppa_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 14/28] m68k: replace cpu_m68k_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 16/28] nios2: replace cpu_nios2_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 15/28] microblaze: replace cpu_mb_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 17/28] tilegx: replace cpu_tilegx_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 18/28] xtensa: replace cpu_xtensa_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 20/28] sh4: replace cpu_sh4_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 19/28] tricore: replace cpu_tricore_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 22/28] cris: replace cpu_cris_init() with cpu_generic_init(),
Igor Mammedov <=
- [Qemu-devel] [PATCH 21/28] arm: replace cpu_arm_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 23/28] x86: replace cpu_x86_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 25/28] moxie: replace cpu_moxie_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 24/28] lm32: replace cpu_lm32_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 26/28] openrisc: replace cpu_openrisc_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 27/28] unicore32: replace uc32_cpu_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14
- [Qemu-devel] [PATCH 28/28] ppc: replace cpu_ppc_init() with cpu_generic_init(), Igor Mammedov, 2017/07/14