From patchwork Wed Jan 16 05:32:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 212407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 778972C0093 for ; Wed, 16 Jan 2013 17:26:16 +1100 (EST) Received: from localhost ([::1]:37492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvLe9-0005Sc-LH for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 00:34:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvLcw-0003fe-KC for qemu-devel@nongnu.org; Wed, 16 Jan 2013 00:33:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvLct-000837-4s for qemu-devel@nongnu.org; Wed, 16 Jan 2013 00:33:30 -0500 Received: from cantor2.suse.de ([195.135.220.15]:59600 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvLcs-00082u-SF for qemu-devel@nongnu.org; Wed, 16 Jan 2013 00:33:26 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 613BAA51FF; Wed, 16 Jan 2013 06:33:26 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 06:32:57 +0100 Message-Id: <1358314380-9400-13-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Subject: [Qemu-devel] [RFC qom-cpu 12/15] target-sh4: Introduce QOM realizefn for SuperHCPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Introduce a realizefn and set realized = true in cpu_sh4_init(). Signed-off-by: Andreas Färber --- target-sh4/cpu.c | 11 +++++++++++ target-sh4/translate.c | 5 +++-- 2 Dateien geändert, 14 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c index e4858a0..c07a012 100644 --- a/target-sh4/cpu.c +++ b/target-sh4/cpu.c @@ -53,6 +53,14 @@ static void superh_cpu_reset(CPUState *s) set_default_nan_mode(1, &env->fp_status); } +static void superh_cpu_realizefn(DeviceState *dev, Error **errp) +{ + SuperHCPU *cpu = SUPERH_CPU(dev); + + cpu_reset(CPU(cpu)); + qemu_init_vcpu(&cpu->env); +} + static void superh_cpu_initfn(Object *obj) { SuperHCPU *cpu = SUPERH_CPU(obj); @@ -65,9 +73,12 @@ static void superh_cpu_initfn(Object *obj) static void superh_cpu_class_init(ObjectClass *oc, void *data) { + DeviceClass *dc = DEVICE_CLASS(oc); CPUClass *cc = CPU_CLASS(oc); SuperHCPUClass *scc = SUPERH_CPU_CLASS(oc); + dc->realize = superh_cpu_realizefn; + scc->parent_reset = cc->reset; cc->reset = superh_cpu_reset; } diff --git a/target-sh4/translate.c b/target-sh4/translate.c index 260aaab..2409a10 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -253,9 +253,10 @@ SuperHCPU *cpu_sh4_init(const char *cpu_model) env->features = def->features; sh4_translate_init(); env->cpu_model_str = cpu_model; - cpu_reset(CPU(cpu)); cpu_register(env, def); - qemu_init_vcpu(env); + + object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + return cpu; }