[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/47] target-lm32: Introduce QOM realizefn for LM32
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 08/47] target-lm32: Introduce QOM realizefn for LM32CPU |
Date: |
Sat, 16 Feb 2013 16:45:03 +0100 |
Introduce a realizefn and set realized = true in cpu_lm32_init().
Also move cpu_reset() call from initfn to realizefn.
Signed-off-by: Andreas Färber <address@hidden>
---
target-lm32/cpu-qom.h | 2 ++
target-lm32/cpu.c | 18 ++++++++++++++++--
target-lm32/helper.c | 4 ++--
3 Dateien geändert, 20 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/target-lm32/cpu-qom.h b/target-lm32/cpu-qom.h
index 400cdbd..d7525b3 100644
--- a/target-lm32/cpu-qom.h
+++ b/target-lm32/cpu-qom.h
@@ -34,6 +34,7 @@
/**
* LM32CPUClass:
+ * @parent_realize: The parent class' realize handler.
* @parent_reset: The parent class' reset handler.
*
* A LatticeMico32 CPU model.
@@ -43,6 +44,7 @@ typedef struct LM32CPUClass {
CPUClass parent_class;
/*< public >*/
+ DeviceRealize parent_realize;
void (*parent_reset)(CPUState *cpu);
} LM32CPUClass;
diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c
index eca2dca..6a84f51 100644
--- a/target-lm32/cpu.c
+++ b/target-lm32/cpu.c
@@ -42,6 +42,18 @@ static void lm32_cpu_reset(CPUState *s)
memset(env, 0, offsetof(CPULM32State, breakpoints));
}
+static void lm32_cpu_realizefn(DeviceState *dev, Error **errp)
+{
+ LM32CPU *cpu = LM32_CPU(dev);
+ LM32CPUClass *lcc = LM32_CPU_GET_CLASS(dev);
+
+ cpu_reset(CPU(cpu));
+
+ qemu_init_vcpu(&cpu->env);
+
+ lcc->parent_realize(dev, errp);
+}
+
static void lm32_cpu_initfn(Object *obj)
{
LM32CPU *cpu = LM32_CPU(obj);
@@ -50,14 +62,16 @@ static void lm32_cpu_initfn(Object *obj)
cpu_exec_init(env);
env->flags = 0;
-
- cpu_reset(CPU(cpu));
}
static void lm32_cpu_class_init(ObjectClass *oc, void *data)
{
LM32CPUClass *lcc = LM32_CPU_CLASS(oc);
CPUClass *cc = CPU_CLASS(oc);
+ DeviceClass *dc = DEVICE_CLASS(oc);
+
+ lcc->parent_realize = dc->realize;
+ dc->realize = lm32_cpu_realizefn;
lcc->parent_reset = cc->reset;
cc->reset = lm32_cpu_reset;
diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index d76ea3f..a6691ad 100644
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -212,13 +212,13 @@ LM32CPU *cpu_lm32_init(const char *cpu_model)
env->num_wps = def->num_watchpoints;
env->cfg = cfg_by_def(def);
- qemu_init_vcpu(env);
-
if (tcg_enabled() && !tcg_initialized) {
tcg_initialized = 1;
lm32_translate_init();
}
+ object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
+
return cpu;
}
--
1.7.10.4
- [Qemu-devel] [PULL 00/47] QOM CPUState patch queue 2013-02-16, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 02/47] target-alpha: Update AlphaCPU to QOM realizefn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 01/47] cpu: Prepare QOM realizefn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 03/47] target-arm: Update ARMCPU to QOM realizefn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 04/47] target-i386: Update X86CPU to QOM realizefn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 05/47] target-openrisc: Update OpenRISCCPU to QOM realizefn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 10/47] target-microblaze: Introduce QOM realizefn for MicroBlazeCPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 08/47] target-lm32: Introduce QOM realizefn for LM32CPU,
Andreas Färber <=
- [Qemu-devel] [PATCH 06/47] target-ppc: Update PowerPCCPU to QOM realizefn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 07/47] target-cris: Introduce QOM realizefn for CRISCPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 09/47] target-m68k: Introduce QOM realizefn for M68kCPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 12/47] target-s390x: Introduce QOM realizefn for S390CPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 15/47] target-unicore32: Introduce QOM realizefn for UniCore32CPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 11/47] target-mips: Introduce QOM realizefn for MIPSCPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 13/47] target-sh4: Introduce QOM realizefn for SuperHCPU, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 19/47] target-lm32: Move TCG initialization to LM32CPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 18/47] target-cris: Move TCG initialization to CRISCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 17/47] target-arm: Move TCG initialization to ARMCPU initfn, Andreas Färber, 2013/02/16