From patchwork Wed Apr 11 23:19:37 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: 151927 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 DA9D2B7060 for ; Thu, 12 Apr 2012 09:20:03 +1000 (EST) Received: from localhost ([::1]:33777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI6pV-0000I5-HE for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 19:20:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI6pH-0000H9-Qy for qemu-devel@nongnu.org; Wed, 11 Apr 2012 19:19:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SI6pF-0002To-Au for qemu-devel@nongnu.org; Wed, 11 Apr 2012 19:19:47 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37669 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI6pF-0002T4-53 for qemu-devel@nongnu.org; Wed, 11 Apr 2012 19:19:45 -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 17A5F8FE2D; Thu, 12 Apr 2012 01:19:44 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 12 Apr 2012 01:19:37 +0200 Message-Id: <1334186378-10904-3-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1334186378-10904-1-git-send-email-afaerber@suse.de> References: <1334186378-10904-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: blauwirbel@gmail.com, edgar.iglesias@gmail.com, Michael Walle , =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH v3 2/3] target-lm32: QOM'ify 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 code from cpu_lm32_init() to an initfn; call cpu_reset() instead of cpu_state_reset(). Signed-off-by: Andreas Färber Acked-by: Michael Walle --- target-lm32/cpu.c | 13 +++++++++++++ target-lm32/helper.c | 3 --- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c index 4ce7e3b..70251d0 100644 --- a/target-lm32/cpu.c +++ b/target-lm32/cpu.c @@ -34,6 +34,18 @@ static void lm32_cpu_reset(CPUState *s) cpu_state_reset(env); } +static void lm32_cpu_initfn(Object *obj) +{ + LM32CPU *cpu = LM32_CPU(obj); + CPULM32State *env = &cpu->env; + + cpu_exec_init(env); + + env->flags = 0; + + cpu_reset(CPU(cpu)); +} + static void lm32_cpu_class_init(ObjectClass *oc, void *data) { LM32CPUClass *lcc = LM32_CPU_CLASS(oc); @@ -47,6 +59,7 @@ static const TypeInfo lm32_cpu_type_info = { .name = TYPE_LM32_CPU, .parent = TYPE_CPU, .instance_size = sizeof(LM32CPU), + .instance_init = lm32_cpu_initfn, .abstract = false, .class_size = sizeof(LM32CPUClass), .class_init = lm32_cpu_class_init, diff --git a/target-lm32/helper.c b/target-lm32/helper.c index 3cf86d7..9de777f 100644 --- a/target-lm32/helper.c +++ b/target-lm32/helper.c @@ -211,10 +211,7 @@ CPULM32State *cpu_lm32_init(const char *cpu_model) env->num_bps = def->num_breakpoints; env->num_wps = def->num_watchpoints; env->cfg = cfg_by_def(def); - env->flags = 0; - cpu_exec_init(env); - cpu_state_reset(env); qemu_init_vcpu(env); if (tcg_enabled() && !tcg_initialized) {