From patchwork Sun Jan 20 07:22:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [RFC, qom-cpu, v2, 16/28] target-xtensa: Introduce QOM realizefn for XtensaCPU Date: Sat, 19 Jan 2013 21:22:39 -0000 From: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 213933 Message-Id: <1358666571-1737-17-git-send-email-afaerber@suse.de> To: qemu-devel@nongnu.org Cc: Max Filippov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Introduce realizefn and set realized = true in cpu_xtensa_init(). Signed-off-by: Andreas Färber --- target-xtensa/cpu-qom.h | 2 ++ target-xtensa/cpu.c | 14 ++++++++++++++ target-xtensa/helper.c | 4 +++- 3 Dateien geändert, 19 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/target-xtensa/cpu-qom.h b/target-xtensa/cpu-qom.h index e344a9a..270de16 100644 --- a/target-xtensa/cpu-qom.h +++ b/target-xtensa/cpu-qom.h @@ -43,6 +43,7 @@ /** * XtensaCPUClass: + * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. * * An Xtensa CPU model. @@ -52,6 +53,7 @@ typedef struct XtensaCPUClass { CPUClass parent_class; /*< public >*/ + DeviceRealize parent_realize; void (*parent_reset)(CPUState *cpu); } XtensaCPUClass; diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c index 035b07c..ec99ae9 100644 --- a/target-xtensa/cpu.c +++ b/target-xtensa/cpu.c @@ -56,6 +56,16 @@ static void xtensa_cpu_reset(CPUState *s) reset_mmu(env); } +static void xtensa_cpu_realizefn(DeviceState *dev, Error **errp) +{ + XtensaCPU *cpu = XTENSA_CPU(dev); + XtensaCPUClass *xcc = XTENSA_CPU_GET_CLASS(dev); + + qemu_init_vcpu(&cpu->env); + + xcc->parent_realize(dev, errp); +} + static void xtensa_cpu_initfn(Object *obj) { XtensaCPU *cpu = XTENSA_CPU(obj); @@ -66,9 +76,13 @@ static void xtensa_cpu_initfn(Object *obj) static void xtensa_cpu_class_init(ObjectClass *oc, void *data) { + DeviceClass *dc = DEVICE_CLASS(oc); CPUClass *cc = CPU_CLASS(oc); XtensaCPUClass *xcc = XTENSA_CPU_CLASS(cc); + xcc->parent_realize = dc->realize; + dc->realize = xtensa_cpu_realizefn; + xcc->parent_reset = cc->reset; cc->reset = xtensa_cpu_reset; } diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c index 94c03a1..14bcc7e 100644 --- a/target-xtensa/helper.c +++ b/target-xtensa/helper.c @@ -104,7 +104,9 @@ XtensaCPU *cpu_xtensa_init(const char *cpu_model) } xtensa_irq_init(env); - qemu_init_vcpu(env); + + object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + return cpu; }