From nobody Tue Feb 10 07:40:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499240380438461.50157903137574; Wed, 5 Jul 2017 00:39:40 -0700 (PDT) Received: from localhost ([::1]:44597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSeuR-0002L3-5q for importer@patchew.org; Wed, 05 Jul 2017 03:39:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSeX4-0004y0-DU for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSeWz-0007oO-Oc for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:30 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35278) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSeWz-0007ny-I2 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:25 -0400 Received: by mail-wm0-x242.google.com with SMTP id u23so30504077wma.2 for ; Wed, 05 Jul 2017 00:15:25 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id y35sm22202793wrc.51.2017.07.05.00.15.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 00:15:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mrtbm0wiIbSdcQtkyOcqXjRLVYJhdr7PIdTZnz45XSo=; b=J4FeubZ456iHrpmf0GpurOCMSg2lJin+QemoV770ZdpLLznTfqtjfPoiqtp/gSEFYs iahmpLm5HSLJ77KPjTSC+7fs0t4rcQCUolsoaIiaxW58UcK4uJ4ZeJj2q+SxIEicLxdI MAzO5sXxdfTqM65vXbfCUfmiKH8VKlGBdchZjEeTeAzi9bAHNlezx/QQwAKs0wJEtvQJ 1G7a5M8/fgNRYCbAYTo0pqcTAgmMA15D0cMhRuFJ9ZVAMTHJwP2554gsXMrdAz7VKk9v 1ILMCCf6dUG64IY+16JG9CVlyO37ehnH+iBMH15AvjoB4uflHvlVQKfD/aZWXAcajmVY ighg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=mrtbm0wiIbSdcQtkyOcqXjRLVYJhdr7PIdTZnz45XSo=; b=qEOnOrLMFbq/bxOk5KHHEiQdQw6v4JmXg9JuGjxmYu1O8A7GLdbcsiRaXU746ubypx 5ayZm9/Z4cSm0IKLMtirQ0QH8Zds6PCojiQG1SA6xVk4mbUvR9IowW4RlqfTop1fi/GG 4BMZ3Gkru4LGglxd7dx+zhJSBGbfETc6pVKWcbAikoqNTIN1WM1UUKIRQtzU4MWAUoLV EkJeUS9wkIYiyBI2693opHcnXln0Rq4EN3OZq3pOh9hhN6gH3OiNk9HRcGOxjy9jDU6g T4AzbHEWfFAs9lu43lGvfbBzZuKXatn6q+hhUnaPCd/48ghUPU6m8cOtKA/jUWg1re4h JpRw== X-Gm-Message-State: AKS2vOyHFU7wl8Kt5RJZaWodlVODDoUe+SbWkIZDx2UgBVsixPDqXncX VQWWljzQ34HIypcSXmA= X-Received: by 10.28.68.66 with SMTP id r63mr20824171wma.120.1499238924356; Wed, 05 Jul 2017 00:15:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 5 Jul 2017 09:14:32 +0200 Message-Id: <1499238885-26161-30-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499238885-26161-1-git-send-email-pbonzini@redhat.com> References: <1499238885-26161-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 29/42] tcg: make tcg_allowed global X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yang Zhong Change the tcg_enabled() and make sure user build still enable tcg even x86 softmmu disable tcg. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini --- accel/tcg/cpu-exec-common.c | 2 ++ accel/tcg/tcg-all.c | 1 - accel/tcg/translate-all.c | 6 +----- include/qemu-common.h | 7 ++++++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c index e81da27..5b4ae54 100644 --- a/accel/tcg/cpu-exec-common.c +++ b/accel/tcg/cpu-exec-common.c @@ -23,6 +23,8 @@ #include "exec/exec-all.h" #include "exec/memory-internal.h" =20 +bool tcg_allowed; + /* exit the current TB, but without causing any exception to be raised */ void cpu_loop_exit_noexc(CPUState *cpu) { diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index c1ccad3..56dbb56 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -33,7 +33,6 @@ #include "qemu/main-loop.h" =20 unsigned long tcg_tb_size; -static bool tcg_allowed =3D true; =20 #ifndef CONFIG_USER_ONLY /* mask must never be zero, except for A20 change call */ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 4fda383..f768681 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -784,6 +784,7 @@ static void tb_htable_init(void) size. */ void tcg_exec_init(unsigned long tb_size) { + tcg_allowed =3D true; cpu_gen_init(); page_init(); tb_htable_init(); @@ -795,11 +796,6 @@ void tcg_exec_init(unsigned long tb_size) #endif } =20 -bool tcg_enabled(void) -{ - return tcg_ctx.code_gen_buffer !=3D NULL; -} - /* * Allocate a new translation block. Flush the translation buffer if * too many translation blocks or too much generated code. diff --git a/include/qemu-common.h b/include/qemu-common.h index 387ef52..b5adbfa 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -76,8 +76,13 @@ int qemu_openpty_raw(int *aslave, char *pty_name); sendto(sockfd, buf, len, flags, destaddr, addrlen) #endif =20 +extern bool tcg_allowed; void tcg_exec_init(unsigned long tb_size); -bool tcg_enabled(void); +#ifdef CONFIG_TCG +#define tcg_enabled() (tcg_allowed) +#else +#define tcg_enabled() 0 +#endif =20 void cpu_exec_init_all(void); void cpu_exec_step_atomic(CPUState *cpu); --=20 1.8.3.1