[[ I dont know if it's too late ]]
On Mon, Jan 29, 2024 at 9:48 AM Philippe Mathieu-Daudé <phi...@linaro.org>
wrote:
> Mechanical patch produced running the command documented
> in scripts/coccinelle/cpu_env.cocci_template header.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
> ---
> bsd-user/signal.c | 3 +--
> linux-user/signal.c | 6 ++----
> 2 files changed, 3 insertions(+), 6 deletions(-)
>
Reviewed-by: Warner Losh <i...@bsdimp.com>
> diff --git a/bsd-user/signal.c b/bsd-user/signal.c
> index ca31470772..c6f0b1be38 100644
> --- a/bsd-user/signal.c
> +++ b/bsd-user/signal.c
> @@ -463,14 +463,13 @@ static int fatal_signal(int sig)
> void force_sig_fault(int sig, int code, abi_ulong addr)
> {
> CPUState *cpu = thread_cpu;
> - CPUArchState *env = cpu_env(cpu);
> target_siginfo_t info = {};
>
> info.si_signo = sig;
> info.si_errno = 0;
> info.si_code = code;
> info.si_addr = addr;
> - queue_signal(env, sig, QEMU_SI_FAULT, &info);
> + queue_signal(cpu_env(cpu), sig, QEMU_SI_FAULT, &info);
> }
>
> static void host_signal_handler(int host_sig, siginfo_t *info, void *puc)
> diff --git a/linux-user/signal.c b/linux-user/signal.c
> index c9527adfa3..f78f7fc476 100644
> --- a/linux-user/signal.c
> +++ b/linux-user/signal.c
> @@ -623,7 +623,6 @@ void signal_init(void)
> void force_sig(int sig)
> {
> CPUState *cpu = thread_cpu;
> - CPUArchState *env = cpu_env(cpu);
> target_siginfo_t info = {};
>
> info.si_signo = sig;
> @@ -631,7 +630,7 @@ void force_sig(int sig)
> info.si_code = TARGET_SI_KERNEL;
> info._sifields._kill._pid = 0;
> info._sifields._kill._uid = 0;
> - queue_signal(env, info.si_signo, QEMU_SI_KILL, &info);
> + queue_signal(cpu_env(cpu), info.si_signo, QEMU_SI_KILL, &info);
> }
>
> /*
> @@ -641,14 +640,13 @@ void force_sig(int sig)
> void force_sig_fault(int sig, int code, abi_ulong addr)
> {
> CPUState *cpu = thread_cpu;
> - CPUArchState *env = cpu_env(cpu);
> target_siginfo_t info = {};
>
> info.si_signo = sig;
> info.si_errno = 0;
> info.si_code = code;
> info._sifields._sigfault._addr = addr;
> - queue_signal(env, sig, QEMU_SI_FAULT, &info);
> + queue_signal(cpu_env(cpu), sig, QEMU_SI_FAULT, &info);
> }
>
> /* Force a SIGSEGV if we couldn't write to memory trying to set
> --
> 2.41.0
>
>
