[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/20] [MIPS] cpu: add a init inplace method
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 01/20] [MIPS] cpu: add a init inplace method |
Date: |
Sun, 1 Aug 2010 19:37:03 +0200 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
target-mips/cpu.h | 1 +
target-mips/translate.c | 16 ++++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index b8e6fee..b75e1e6 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -586,6 +586,7 @@ enum {
int cpu_mips_exec(CPUMIPSState *s);
CPUMIPSState *cpu_mips_init(const char *cpu_model);
+int cpu_mips_init_inplace(CPUMIPSState *env, const char *cpu_model);
//~ uint32_t cpu_mips_get_clock (void);
int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 20b66a8..558f6ac 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -12580,15 +12580,13 @@ static void mips_tcg_init(void)
#include "translate_init.c"
-CPUMIPSState *cpu_mips_init (const char *cpu_model)
+int cpu_mips_init_inplace(CPUMIPSState *env, const char *cpu_model)
{
- CPUMIPSState *env;
const mips_def_t *def;
def = cpu_mips_find_by_name(cpu_model);
if (!def)
- return NULL;
- env = qemu_mallocz(sizeof(CPUMIPSState));
+ return -1;
env->cpu_model = def;
env->cpu_model_str = cpu_model;
@@ -12601,6 +12599,16 @@ CPUMIPSState *cpu_mips_init (const char *cpu_model)
mips_tcg_init();
cpu_reset(env);
qemu_init_vcpu(env);
+ return 0;
+}
+
+CPUMIPSState *cpu_mips_init (const char *cpu_model)
+{
+ CPUMIPSState *env;
+
+ env = qemu_mallocz(sizeof(CPUMIPSState));
+ if (!cpu_mips_init_inplace(env, cpu_model))
+ return NULL;
return env;
}
--
1.7.1.GIT
- [Qemu-devel] [PATCH 00/20] MIPS Magnum conversion to qdev, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 01/20] [MIPS] cpu: add a init inplace method,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 02/20] [MIPS] cpu: convert to qdev, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 03/20] [MIPS] Jazz emulation: create a qdev cpu, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 04/20] [MIPS] rc4030: convert to qdev, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 05/20] Add a stub for some rc4030 functions, if rc4030 support is not compiled in., Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 06/20] [MIPS] qdev: convert i8042 to rc4030 device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 07/20] [MIPS] qdev: convert parallel port to rc4030 device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 08/20] [MIPS] qdev: convert serial port to rc4030 device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 09/20] [MIPS] qdev: convert jazz-led to sysbus device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 10/20] [MIPS] Jazz emulation: make video card optional, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 11/20] [MIPS] qdev: convert vga-isa-mm to ISA device, Hervé Poussineau, 2010/08/01