qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: alex.bennee@linaro.org, Weiwei Li <liweiwei@iscas.ac.cn>,
	Junqiang Wang <wangjunqiang@iscas.ac.cn>
Subject: [PATCH 2/3] accel/tcg: Fix overwrite problems of tcg_cflags
Date: Fri, 31 Mar 2023 21:51:05 -0700	[thread overview]
Message-ID: <20230401045106.3885562-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230401045106.3885562-1-richard.henderson@linaro.org>

From: Weiwei Li <liweiwei@iscas.ac.cn>

CPUs often set CF_PCREL in tcg_cflags before qemu_init_vcpu(), in which
tcg_cflags will be overwrited by tcg_cpu_init_cflags().

Fixes: 4be790263ffc ("accel/tcg: Replace `TARGET_TB_PCREL` with `CF_PCREL`")
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn>
Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn>
Message-Id: <20230331150609.114401-6-liweiwei@iscas.ac.cn>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/tcg-accel-ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c
index af35e0d092..58c8e64096 100644
--- a/accel/tcg/tcg-accel-ops.c
+++ b/accel/tcg/tcg-accel-ops.c
@@ -59,7 +59,7 @@ void tcg_cpu_init_cflags(CPUState *cpu, bool parallel)
 
     cflags |= parallel ? CF_PARALLEL : 0;
     cflags |= icount_enabled() ? CF_USE_ICOUNT : 0;
-    cpu->tcg_cflags = cflags;
+    cpu->tcg_cflags |= cflags;
 }
 
 void tcg_cpus_destroy(CPUState *cpu)
-- 
2.34.1



  parent reply	other threads:[~2023-04-01  4:52 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-01  4:51 [PATCH for-8.0 0/3] last minute tcg fixes Richard Henderson
2023-04-01  4:51 ` [PATCH 1/3] Revert "linux-user/arm: Take more care allocating commpage" Richard Henderson
2023-04-03  6:36   ` Philippe Mathieu-Daudé
2023-04-01  4:51 ` Richard Henderson [this message]
2023-04-03  8:09   ` [PATCH 2/3] accel/tcg: Fix overwrite problems of tcg_cflags Philippe Mathieu-Daudé
2023-04-03  9:09     ` liweiwei
2023-04-03 10:44       ` Anton Johansson via
2023-04-04 14:57         ` Philippe Mathieu-Daudé
2023-04-01  4:51 ` [PATCH 3/3] accel/tcg: Fix jump cache set in cpu_exec_loop Richard Henderson
2023-04-01 11:03   ` liweiwei
2023-04-01 20:46     ` Richard Henderson
2023-04-04 14:06   ` Peter Maydell
2023-04-04 13:49 ` [PATCH for-8.0 0/3] last minute tcg fixes Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230401045106.3885562-3-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=liweiwei@iscas.ac.cn \
    --cc=qemu-devel@nongnu.org \
    --cc=wangjunqiang@iscas.ac.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).