From patchwork Sat Feb 16 15:45:02 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: 220981 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 AD2AB2C0080 for ; Sun, 17 Feb 2013 03:52:56 +1100 (EST) Received: from localhost ([::1]:51035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6k1x-0005Mx-F7 for incoming@patchwork.ozlabs.org; Sat, 16 Feb 2013 10:50:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6k0c-0003vS-Hx for qemu-devel@nongnu.org; Sat, 16 Feb 2013 10:49:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U6k0a-0002Gi-V9 for qemu-devel@nongnu.org; Sat, 16 Feb 2013 10:49:02 -0500 Received: from cantor2.suse.de ([195.135.220.15]:40345 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6k0a-0002GZ-Kj for qemu-devel@nongnu.org; Sat, 16 Feb 2013 10:49:00 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 222E7A398D; Sat, 16 Feb 2013 16:49:00 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sat, 16 Feb 2013 16:45:02 +0100 Message-Id: <1361029542-8412-8-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361029542-8412-1-git-send-email-afaerber@suse.de> References: <1361029542-8412-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: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 07/47] target-cris: Introduce QOM realizefn for CRISCPU 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 realizefn and set realized = true from cpu_cris_init(). Reviewed-by: Eduardo Habkost Signed-off-by: Andreas Färber --- target-cris/cpu-qom.h | 2 ++ target-cris/cpu.c | 15 +++++++++++++++ target-cris/translate.c | 3 +-- 3 Dateien geändert, 18 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/target-cris/cpu-qom.h b/target-cris/cpu-qom.h index 41ab9b2..7ad8398 100644 --- a/target-cris/cpu-qom.h +++ b/target-cris/cpu-qom.h @@ -33,6 +33,7 @@ /** * CRISCPUClass: + * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. * * A CRIS CPU model. @@ -42,6 +43,7 @@ typedef struct CRISCPUClass { CPUClass parent_class; /*< public >*/ + DeviceRealize parent_realize; void (*parent_reset)(CPUState *cpu); } CRISCPUClass; diff --git a/target-cris/cpu.c b/target-cris/cpu.c index 3f64a57..34c4f75 100644 --- a/target-cris/cpu.c +++ b/target-cris/cpu.c @@ -55,6 +55,17 @@ static void cris_cpu_reset(CPUState *s) #endif } +static void cris_cpu_realizefn(DeviceState *dev, Error **errp) +{ + CRISCPU *cpu = CRIS_CPU(dev); + CRISCPUClass *ccc = CRIS_CPU_GET_CLASS(dev); + + cpu_reset(CPU(cpu)); + qemu_init_vcpu(&cpu->env); + + ccc->parent_realize(dev, errp); +} + static void cris_cpu_initfn(Object *obj) { CRISCPU *cpu = CRIS_CPU(obj); @@ -65,9 +76,13 @@ static void cris_cpu_initfn(Object *obj) static void cris_cpu_class_init(ObjectClass *oc, void *data) { + DeviceClass *dc = DEVICE_CLASS(oc); CPUClass *cc = CPU_CLASS(oc); CRISCPUClass *ccc = CRIS_CPU_CLASS(oc); + ccc->parent_realize = dc->realize; + dc->realize = cris_cpu_realizefn; + ccc->parent_reset = cc->reset; cc->reset = cris_cpu_reset; } diff --git a/target-cris/translate.c b/target-cris/translate.c index 09e6011..25ff490 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3558,8 +3558,7 @@ CRISCPU *cpu_cris_init(const char *cpu_model) env->pregs[PR_VR] = vr_by_name(cpu_model); - cpu_reset(CPU(cpu)); - qemu_init_vcpu(env); + object_property_set_bool(OBJECT(cpu), true, "realized", NULL); if (tcg_initialized) { return cpu;