From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwpFK-0006Jk-Ed for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TwpFG-0006Zf-L8 for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:13 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Jan 2013 08:22:29 +0100 Message-Id: <1358666571-1737-7-git-send-email-afaerber@suse.de> In-Reply-To: <1358666571-1737-1-git-send-email-afaerber@suse.de> References: <1358666571-1737-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC qom-cpu v2 06/28] target-ppc: Update PowerPCCPU to QOM realizefn List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "open list:PowerPC" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Adapt ppc_cpu_realize() signature, hook it up to DeviceClass and set realized =3D true in cpu_ppc_init(). Signed-off-by: Andreas F=C3=A4rber --- target-ppc/cpu-qom.h | 2 ++ target-ppc/translate_init.c | 12 +++++++++--- 2 Dateien ge=C3=A4ndert, 11 Zeilen hinzugef=C3=BCgt(+), 3 Zeilen entfern= t(-) diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h index b338f8f..2b82cdb 100644 --- a/target-ppc/cpu-qom.h +++ b/target-ppc/cpu-qom.h @@ -40,6 +40,7 @@ =20 /** * PowerPCCPUClass: + * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. * * A PowerPC CPU model. @@ -49,6 +50,7 @@ typedef struct PowerPCCPUClass { CPUClass parent_class; /*< public >*/ =20 + DeviceRealize parent_realize; void (*parent_reset)(CPUState *cpu); =20 /* TODO inline fields here */ diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 2d78529..63ba4a5 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -10029,9 +10029,9 @@ static int ppc_fixup_cpu(PowerPCCPU *cpu) return 0; } =20 -static void ppc_cpu_realize(Object *obj, Error **errp) +static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) { - PowerPCCPU *cpu =3D POWERPC_CPU(obj); + PowerPCCPU *cpu =3D POWERPC_CPU(dev); CPUPPCState *env =3D &cpu->env; PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); ppc_def_t *def =3D pcc->info; @@ -10071,6 +10071,8 @@ static void ppc_cpu_realize(Object *obj, Error **= errp) =20 qemu_init_vcpu(env); =20 + pcc->parent_realize(dev, errp); + #if defined(PPC_DUMP_CPU) { const char *mmu_model, *excp_model, *bus_model; @@ -10342,7 +10344,7 @@ PowerPCCPU *cpu_ppc_init(const char *cpu_model) =20 env->cpu_model_str =3D cpu_model; =20 - ppc_cpu_realize(OBJECT(cpu), &err); + object_property_set_bool(OBJECT(cpu), true, "realized", &err); if (err !=3D NULL) { fprintf(stderr, "%s\n", error_get_pretty(err)); error_free(err); @@ -10563,6 +10565,10 @@ static void ppc_cpu_class_init(ObjectClass *oc, = void *data) { PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); CPUClass *cc =3D CPU_CLASS(oc); + DeviceClass *dc =3D DEVICE_CLASS(oc); + + pcc->parent_realize =3D dc->realize; + dc->realize =3D ppc_cpu_realizefn; =20 pcc->parent_reset =3D cc->reset; cc->reset =3D ppc_cpu_reset; --=20 1.7.10.4