From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvLcq-0003Px-KT for qemu-devel@nongnu.org; Wed, 16 Jan 2013 00:33:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvLcp-000812-0Y for qemu-devel@nongnu.org; Wed, 16 Jan 2013 00:33:24 -0500 Received: from cantor2.suse.de ([195.135.220.15]:59593 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvLco-00080p-QG for qemu-devel@nongnu.org; Wed, 16 Jan 2013 00:33:22 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 16 Jan 2013 06:32:53 +0100 Message-Id: <1358314380-9400-9-git-send-email-afaerber@suse.de> In-Reply-To: <1358314380-9400-1-git-send-email-afaerber@suse.de> References: <1358314380-9400-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 08/15] target-m68k: Introduce QOM realizefn for M68kCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Introduce realizefn and set realized =3D true in cpu_m68k_init(). Signed-off-by: Andreas F=C3=A4rber --- target-m68k/cpu.c | 11 +++++++++++ target-m68k/helper.c | 3 +-- 2 Dateien ge=C3=A4ndert, 12 Zeilen hinzugef=C3=BCgt(+), 2 Zeilen entfern= t(-) diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index ce89674..633fcc7 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -119,6 +119,14 @@ static const M68kCPUInfo m68k_cpus[] =3D { { .name =3D "any", .instance_init =3D any_cpu_initfn }, }; =20 +static void m68k_cpu_realizefn(DeviceState *dev, Error **errp) +{ + M68kCPU *cpu =3D M68K_CPU(dev); + + cpu_reset(CPU(cpu)); + qemu_init_vcpu(&cpu->env); +} + static void m68k_cpu_initfn(Object *obj) { M68kCPU *cpu =3D M68K_CPU(obj); @@ -131,6 +139,9 @@ static void m68k_cpu_class_init(ObjectClass *c, void = *data) { M68kCPUClass *mcc =3D M68K_CPU_CLASS(c); CPUClass *cc =3D CPU_CLASS(c); + DeviceClass *dc =3D DEVICE_CLASS(c); + + dc->realize =3D m68k_cpu_realizefn; =20 mcc->parent_reset =3D cc->reset; cc->reset =3D m68k_cpu_reset; diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 097fc78..14b399a 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -119,8 +119,7 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model) } /* TODO: Add [E]MAC registers. */ =20 - cpu_reset(ENV_GET_CPU(env)); - qemu_init_vcpu(env); + object_property_set_bool(OBJECT(cpu), true, "realized", NULL); return env; } =20 --=20 1.7.10.4