From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zd1Uy-0004dA-1U for qemu-devel@nongnu.org; Fri, 18 Sep 2015 15:39:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zd1Uw-0002Bi-JV for qemu-devel@nongnu.org; Fri, 18 Sep 2015 15:39:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zd1Uw-0002BO-Eo for qemu-devel@nongnu.org; Fri, 18 Sep 2015 15:39:06 -0400 From: Eduardo Habkost Date: Fri, 18 Sep 2015 16:38:14 -0300 Message-Id: <1442605096-14103-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1442605096-14103-1-git-send-email-ehabkost@redhat.com> References: <1442605096-14103-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/4] target-i386: Move TCG initialization check to tcg_x86_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zhugh.fnst@cn.fujitsu.com, tangchen@cn.fujitsu.com, chen.fan.fnst@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, Paolo Bonzini , Gu Zheng , Igor Mammedov , anshul.makkar@profitbricks.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Instead of requiring cpu.c to check if TCG was already initialized, simply let the function be called multiple times. Suggested-by: Igor Mammedov Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 4 +--- target-i386/translate.c | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 22c0f5b..f054a69 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -3021,7 +3021,6 @@ static void x86_cpu_initfn(Object *obj) X86CPUClass *xcc = X86_CPU_GET_CLASS(obj); CPUX86State *env = &cpu->env; FeatureWord w; - static int inited; cs->env_ptr = env; cpu_exec_init(cs, &error_abort); @@ -3072,8 +3071,7 @@ static void x86_cpu_initfn(Object *obj) x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort); /* init various static tables used in TCG mode */ - if (tcg_enabled() && !inited) { - inited = 1; + if (tcg_enabled()) { tcg_x86_init(); } } diff --git a/target-i386/translate.c b/target-i386/translate.c index e6e60e5..8ed3902 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -7821,6 +7821,12 @@ void tcg_x86_init(void) #endif }; int i; + static bool initialized = false; + + if (initialized) { + return; + } + initialized = true; cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env"); cpu_cc_op = tcg_global_mem_new_i32(TCG_AREG0, -- 2.1.0