| Message ID | 20220114153732.3767229-3-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | linux-user: Fix some minor nits | expand |
On 14/1/22 16:37, Peter Maydell wrote: > In commit c599d4d6d6e9bfdb64 in 2016 we renamed the old force_sig() > function to dump_core_and_abort(), but we forgot to rename the > associated tracepoint. Rename the tracepoint to to match the > function it's called from. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > linux-user/signal.c | 2 +- > linux-user/trace-events | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Le 14/01/2022 à 16:37, Peter Maydell a écrit : > In commit c599d4d6d6e9bfdb64 in 2016 we renamed the old force_sig() > function to dump_core_and_abort(), but we forgot to rename the > associated tracepoint. Rename the tracepoint to to match the > function it's called from. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > linux-user/signal.c | 2 +- > linux-user/trace-events | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/linux-user/signal.c b/linux-user/signal.c > index f813b4f18e4..bfbbeab9ad2 100644 > --- a/linux-user/signal.c > +++ b/linux-user/signal.c > @@ -734,7 +734,7 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) > struct sigaction act; > > host_sig = target_to_host_signal(target_sig); > - trace_user_force_sig(env, target_sig, host_sig); > + trace_user_dump_core_and_abort(env, target_sig, host_sig); > gdb_signalled(env, target_sig); > > /* dump core if supported by target binary format */ > diff --git a/linux-user/trace-events b/linux-user/trace-events > index e7d2f54e940..f33717f248a 100644 > --- a/linux-user/trace-events > +++ b/linux-user/trace-events > @@ -9,7 +9,7 @@ user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 > user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 > user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 > user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 > -user_force_sig(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)" > +user_dump_core_and_abort(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)" > user_handle_signal(void *env, int target_sig) "env=%p signal %d" > user_host_signal(void *env, int host_sig, int target_sig) "env=%p signal %d (target %d)" > user_queue_signal(void *env, int target_sig) "env=%p signal %d" Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/linux-user/signal.c b/linux-user/signal.c index f813b4f18e4..bfbbeab9ad2 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -734,7 +734,7 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) struct sigaction act; host_sig = target_to_host_signal(target_sig); - trace_user_force_sig(env, target_sig, host_sig); + trace_user_dump_core_and_abort(env, target_sig, host_sig); gdb_signalled(env, target_sig); /* dump core if supported by target binary format */ diff --git a/linux-user/trace-events b/linux-user/trace-events index e7d2f54e940..f33717f248a 100644 --- a/linux-user/trace-events +++ b/linux-user/trace-events @@ -9,7 +9,7 @@ user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 -user_force_sig(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)" +user_dump_core_and_abort(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)" user_handle_signal(void *env, int target_sig) "env=%p signal %d" user_host_signal(void *env, int host_sig, int target_sig) "env=%p signal %d (target %d)" user_queue_signal(void *env, int target_sig) "env=%p signal %d"
In commit c599d4d6d6e9bfdb64 in 2016 we renamed the old force_sig() function to dump_core_and_abort(), but we forgot to rename the associated tracepoint. Rename the tracepoint to to match the function it's called from. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- linux-user/signal.c | 2 +- linux-user/trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)