From patchwork Mon Apr 23 14:43:40 2012 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: 154461 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 1DDFDB6FC4 for ; Tue, 24 Apr 2012 00:44:03 +1000 (EST) Received: from localhost ([::1]:52909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMKUi-0007gZ-PQ for incoming@patchwork.ozlabs.org; Mon, 23 Apr 2012 10:44:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMKUb-0007fG-El for qemu-devel@nongnu.org; Mon, 23 Apr 2012 10:43:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMKUZ-0007aH-Fj for qemu-devel@nongnu.org; Mon, 23 Apr 2012 10:43:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37710 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMKUZ-0007Zp-9n for qemu-devel@nongnu.org; Mon, 23 Apr 2012 10:43:51 -0400 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 253858FFEB; Mon, 23 Apr 2012 16:43:50 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 23 Apr 2012 16:43:40 +0200 Message-Id: <1335192223-31188-4-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1335192223-31188-1-git-send-email-afaerber@suse.de> References: <1335192223-31188-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v3 3/6] target-cris: Start QOM'ifying CPU init 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 Move VR-independent code from cpu_cris_init() into an initfn. Signed-off-by: Andreas Färber --- target-cris/cpu.c | 9 +++++++++ target-cris/translate.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/target-cris/cpu.c b/target-cris/cpu.c index 93c7e00..c596609 100644 --- a/target-cris/cpu.c +++ b/target-cris/cpu.c @@ -55,6 +55,14 @@ static void cris_cpu_reset(CPUState *s) #endif } +static void cris_cpu_initfn(Object *obj) +{ + CRISCPU *cpu = CRIS_CPU(obj); + CPUCRISState *env = &cpu->env; + + cpu_exec_init(env); +} + static void cris_cpu_class_init(ObjectClass *oc, void *data) { CPUClass *cc = CPU_CLASS(oc); @@ -68,6 +76,7 @@ static const TypeInfo cris_cpu_type_info = { .name = TYPE_CRIS_CPU, .parent = TYPE_CPU, .instance_size = sizeof(CRISCPU), + .instance_init = cris_cpu_initfn, .abstract = false, .class_size = sizeof(CRISCPUClass), .class_init = cris_cpu_class_init, diff --git a/target-cris/translate.c b/target-cris/translate.c index d3dbac2..e353ea3 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3514,7 +3514,7 @@ CPUCRISState *cpu_cris_init (const char *cpu_model) env = &cpu->env; env->pregs[PR_VR] = vr_by_name(cpu_model); - cpu_exec_init(env); + cpu_reset(CPU(cpu)); qemu_init_vcpu(env);