Merge tag 'pull-tcg-20260612' of https://gitlab.com/rth7680/qemu into staging

tcg: Silence ubsan error on tcg_splitwx_diff causing overflow

# -----BEGIN PGP SIGNATURE-----
#
# iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmosK3gdHHJpY2hhcmQu
# aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV/emAgAo4Pmyr1WXEr8o/MY
# xN3PJldSWsDdtsAUJcca06/KBv07gZzMKge6+fpKexzuYQMbDN7kxoaAh/CQPrtD
# 4jy3W9z84U8EGPetk8e8HoBIYyqKBfdTv838+LYorvZZiyyTJzBfvULe4Fgcbon4
# NUQ/brL5ObLcuAsjUw5jpFaIfhPihnKaAaxzDYASh4CJc4xt1AKAHpzSZ7aywXz0
# g+Y217g4Kv/RjQulab/EkcH0OUzVKgMFJ7RhUq2Ldx8MQLfoJj7foJ37276OcFal
# 6FcDKmyYjEHGSypicfTq2i7DAmSD0Z2Fa6izSyobP5IlzwTBiwhyaK+ZlIE2iaXD
# a/4OqQ==
# =zcQQ
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 12 Jun 2026 11:53:28 EDT
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* tag 'pull-tcg-20260612' of https://gitlab.com/rth7680/qemu:
  tcg: Silence ubsan error on tcg_splitwx_diff causing overflow

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi
2026-06-13 14:02:34 -04:00
2 changed files with 2 additions and 2 deletions

View File

@@ -447,7 +447,7 @@ static inline bool temp_readonly(TCGTemp *ts)
extern __thread TCGContext *tcg_ctx;
extern const void *tcg_code_gen_epilogue;
extern uintptr_t tcg_splitwx_diff;
extern ptrdiff_t tcg_splitwx_diff;
extern TCGv_env tcg_env;
bool in_code_gen_buffer(const void *p);

View File

@@ -244,7 +244,7 @@ unsigned int tcg_cur_ctxs;
unsigned int tcg_max_ctxs;
TCGv_env tcg_env;
const void *tcg_code_gen_epilogue;
uintptr_t tcg_splitwx_diff;
ptrdiff_t tcg_splitwx_diff;
#ifndef CONFIG_TCG_INTERPRETER
tcg_prologue_fn *tcg_qemu_tb_exec;