[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/29] cris: replace cpu_cris_init() with cpu_generic
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 23/29] cris: replace cpu_cris_init() with cpu_generic_init() |
Date: |
Fri, 1 Sep 2017 12:03:11 -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>
Reviewed-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <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 920e1c33ba..5d822dee16 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 80674f6bbb..5eb552bce2 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 5f766f09d6..ceebfed79b 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.13.5
- [Qemu-devel] [PULL 14/29] hppa: replace cpu_hppa_init() with cpu_generic_init(), (continued)
- [Qemu-devel] [PULL 14/29] hppa: replace cpu_hppa_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 12/29] s390x: replace cpu_s390x_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 13/29] alpha: replace cpu_alpha_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 15/29] m68k: replace cpu_m68k_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 16/29] microblaze: replace cpu_mb_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [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 <=
- [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, 2017/09/01
- [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