[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/12] target-m68k: Start QOM'ifying CPU init
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 08/12] target-m68k: Start QOM'ifying CPU init |
Date: |
Wed, 25 Apr 2012 16:23:36 +0200 |
Move model-independent code from cpu_m68k_init() into a QOM initfn.
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Tested-by: Laurent Vivier <address@hidden>
---
target-m68k/cpu.c | 9 +++++++++
target-m68k/helper.c | 2 +-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
index e599ece..0bb1b2c 100644
--- a/target-m68k/cpu.c
+++ b/target-m68k/cpu.c
@@ -48,6 +48,14 @@ static void m68k_cpu_reset(CPUState *s)
tlb_flush(env, 1);
}
+static void m68k_cpu_initfn(Object *obj)
+{
+ M68kCPU *cpu = M68K_CPU(obj);
+ CPUM68KState *env = &cpu->env;
+
+ cpu_exec_init(env);
+}
+
static void m68k_cpu_class_init(ObjectClass *c, void *data)
{
M68kCPUClass *mcc = M68K_CPU_CLASS(c);
@@ -61,6 +69,7 @@ static const TypeInfo m68k_cpu_type_info = {
.name = TYPE_M68K_CPU,
.parent = TYPE_CPU,
.instance_size = sizeof(M68kCPU),
+ .instance_init = m68k_cpu_initfn,
.abstract = false,
.class_size = sizeof(M68kCPUClass),
.class_init = m68k_cpu_class_init,
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index 69fb147..e850d53 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -156,7 +156,7 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model)
cpu = M68K_CPU(object_new(TYPE_M68K_CPU));
env = &cpu->env;
- cpu_exec_init(env);
+
if (!inited) {
inited = 1;
m68k_tcg_init();
--
1.7.7
- [Qemu-devel] [PULL] QOM CPUState for sh4, m68k and mips, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 05/12] target-sh4: Start QOM'ifying CPU init, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 08/12] target-m68k: Start QOM'ifying CPU init,
Andreas Färber <=
- [Qemu-devel] [PATCH 01/12] MAINTAINERS: Downgrade target-m68k to Odd Fixes, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 06/12] target-m68k: QOM'ify CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 04/12] target-sh4: QOM'ify CPU reset, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 10/12] target-mips: QOM'ify CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 07/12] target-m68k: QOM'ify CPU reset, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 12/12] Makefile: Simplify compilation of target-*/cpu.c, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 02/12] MAINTAINERS: Downgrade target-mips and target-sh4 to Odd Fixes, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 11/12] target-mips: Start QOM'ifying CPU init, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 03/12] target-sh4: QOM'ify CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 09/12] target-m68k: Add QOM CPU subclasses, Andreas Färber, 2012/04/25