From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwpFP-0006Yy-Ip for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TwpFN-0006bk-2r for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:19 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45246 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwpFM-0006bR-Pn for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:17 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Jan 2013 08:22:35 +0100 Message-Id: <1358666571-1737-13-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 12/28] target-s390x: Introduce QOM realizefn for S390CPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson Introduce realizefn and set realized =3D true in cpu_s390x_init(). Defer CPU reset from initfn to realizefn. Signed-off-by: Andreas F=C3=A4rber --- target-s390x/cpu-qom.h | 2 ++ target-s390x/cpu.c | 17 +++++++++++++++-- target-s390x/helper.c | 4 +++- 3 Dateien ge=C3=A4ndert, 20 Zeilen hinzugef=C3=BCgt(+), 3 Zeilen entfern= t(-) diff --git a/target-s390x/cpu-qom.h b/target-s390x/cpu-qom.h index d54e4a2..237184f 100644 --- a/target-s390x/cpu-qom.h +++ b/target-s390x/cpu-qom.h @@ -34,6 +34,7 @@ =20 /** * S390CPUClass: + * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. * * An S/390 CPU model. @@ -43,6 +44,7 @@ typedef struct S390CPUClass { CPUClass parent_class; /*< public >*/ =20 + DeviceRealize parent_realize; void (*parent_reset)(CPUState *cpu); } S390CPUClass; =20 diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 0b68db8..60f71fc 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -97,6 +97,17 @@ static void s390_cpu_machine_reset_cb(void *opaque) } #endif =20 +static void s390_cpu_realizefn(DeviceState *dev, Error **errp) +{ + S390CPU *cpu =3D S390_CPU(dev); + S390CPUClass *scc =3D S390_CPU_GET_CLASS(dev); + + qemu_init_vcpu(&cpu->env); + cpu_reset(CPU(cpu)); + + scc->parent_realize(dev, errp); +} + static void s390_cpu_initfn(Object *obj) { S390CPU *cpu =3D S390_CPU(obj); @@ -122,8 +133,6 @@ static void s390_cpu_initfn(Object *obj) #endif env->cpu_num =3D cpu_num++; env->ext_index =3D -1; - - cpu_reset(CPU(cpu)); } =20 static void s390_cpu_finalize(Object *obj) @@ -139,6 +148,10 @@ static void s390_cpu_class_init(ObjectClass *oc, voi= d *data) { S390CPUClass *scc =3D S390_CPU_CLASS(oc); CPUClass *cc =3D CPU_CLASS(scc); + DeviceClass *dc =3D DEVICE_CLASS(oc); + + scc->parent_realize =3D dc->realize; + dc->realize =3D s390_cpu_realizefn; =20 scc->parent_reset =3D cc->reset; cc->reset =3D s390_cpu_reset; diff --git a/target-s390x/helper.c b/target-s390x/helper.c index 9a132e6..45020b2 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -85,7 +85,9 @@ S390CPU *cpu_s390x_init(const char *cpu_model) } =20 env->cpu_model_str =3D cpu_model; - qemu_init_vcpu(env); + + object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + return cpu; } =20 --=20 1.7.10.4