From patchwork Wed Apr 25 14:23:36 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: 155005 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 5311BB6FBD for ; Thu, 26 Apr 2012 01:41:13 +1000 (EST) Received: from localhost ([::1]:44890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SN38z-00080a-LL for incoming@patchwork.ozlabs.org; Wed, 25 Apr 2012 10:24:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SN38R-0006Zj-I0 for qemu-devel@nongnu.org; Wed, 25 Apr 2012 10:24:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SN38J-0004IH-J5 for qemu-devel@nongnu.org; Wed, 25 Apr 2012 10:23:59 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59939 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SN38J-0004HV-DE for qemu-devel@nongnu.org; Wed, 25 Apr 2012 10:23: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 40FB690CE3; Wed, 25 Apr 2012 16:23:50 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 25 Apr 2012 16:23:36 +0200 Message-Id: <1335363821-26219-9-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1335363821-26219-1-git-send-email-afaerber@suse.de> References: <1335363821-26219-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: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , Paul Brook Subject: [Qemu-devel] [PATCH 08/12] target-m68k: 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 model-independent code from cpu_m68k_init() into a QOM initfn. Signed-off-by: Andreas Färber Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier --- target-m68k/cpu.c | 9 +++++++++ target-m68k/helper.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index e599ece..0bb1b2c 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -48,6 +48,14 @@ static void m68k_cpu_reset(CPUState *s) tlb_flush(env, 1); } +static void m68k_cpu_initfn(Object *obj) +{ + M68kCPU *cpu = M68K_CPU(obj); + CPUM68KState *env = &cpu->env; + + cpu_exec_init(env); +} + static void m68k_cpu_class_init(ObjectClass *c, void *data) { M68kCPUClass *mcc = M68K_CPU_CLASS(c); @@ -61,6 +69,7 @@ static const TypeInfo m68k_cpu_type_info = { .name = TYPE_M68K_CPU, .parent = TYPE_CPU, .instance_size = sizeof(M68kCPU), + .instance_init = m68k_cpu_initfn, .abstract = false, .class_size = sizeof(M68kCPUClass), .class_init = m68k_cpu_class_init, diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 69fb147..e850d53 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -156,7 +156,7 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model) cpu = M68K_CPU(object_new(TYPE_M68K_CPU)); env = &cpu->env; - cpu_exec_init(env); + if (!inited) { inited = 1; m68k_tcg_init();