From patchwork Sun Jan 20 07:22:43 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: 213921 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 7C2B82C0084 for ; Sun, 20 Jan 2013 18:32:08 +1100 (EST) Received: from localhost ([::1]:38870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwpH5-0000rE-4I for incoming@patchwork.ozlabs.org; Sun, 20 Jan 2013 02:25:03 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwpFV-0006rG-RZ for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TwpFU-0006eR-Nb for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:25 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45263 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwpFU-0006eI-Hc for qemu-devel@nongnu.org; Sun, 20 Jan 2013 02:23:24 -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 19CCFA3A4A; Sun, 20 Jan 2013 08:23:24 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 20 Jan 2013 08:22:43 +0100 Message-Id: <1358666571-1737-21-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358666571-1737-1-git-send-email-afaerber@suse.de> References: <1358666571-1737-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?= , Paul Brook Subject: [Qemu-devel] [RFC qom-cpu v2 20/28] target-m68k: Move TCG initialization to M68kCPU initfn 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 Add a tcg_enabled() check to suppress it for qtest. Signed-off-by: Andreas Färber --- target-m68k/cpu.c | 6 ++++++ target-m68k/helper.c | 7 ------- 2 Dateien geändert, 6 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index f6720ca..bbeae28 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -136,8 +136,14 @@ static void m68k_cpu_initfn(Object *obj) { M68kCPU *cpu = M68K_CPU(obj); CPUM68KState *env = &cpu->env; + static bool inited; cpu_exec_init(env); + + if (tcg_enabled() && !inited) { + inited = true; + m68k_tcg_init(); + } } static void m68k_cpu_class_init(ObjectClass *c, void *data) diff --git a/target-m68k/helper.c b/target-m68k/helper.c index f2d3059..920dfa9 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -97,19 +97,12 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model) { M68kCPU *cpu; CPUM68KState *env; - static int inited; if (object_class_by_name(cpu_model) == NULL) { return NULL; } cpu = M68K_CPU(object_new(cpu_model)); env = &cpu->env; - - if (!inited) { - inited = 1; - m68k_tcg_init(); - } - env->cpu_model_str = cpu_model; register_m68k_insns(env);