From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org,
"Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 7/9] linux-user: Rename user_force_sig tracepoint to match function name
Date: Tue, 18 Jan 2022 13:28:45 +0100 [thread overview]
Message-ID: <20220118122847.636461-8-laurent@vivier.eu> (raw)
In-Reply-To: <20220118122847.636461-1-laurent@vivier.eu>
From: Peter Maydell <peter.maydell@linaro.org>
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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220114153732.3767229-3-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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 f813b4f18e44..bfbbeab9ad2e 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 e7d2f54e9401..f33717f248af 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"
--
2.34.1
next prev parent reply other threads:[~2022-01-18 13:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
2022-01-18 12:28 ` [PULL 1/9] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers Laurent Vivier
2022-01-18 12:28 ` [PULL 2/9] hw/scsi/megasas: Simplify using the ldst API Laurent Vivier
2022-01-18 12:28 ` [PULL 3/9] qdev-core.h: Fix wrongly named reference to TYPE_SPLIT_IRQ Laurent Vivier
2022-01-18 12:28 ` [PULL 4/9] tests: Fix typo in check-help output Laurent Vivier
2022-01-18 12:28 ` [PULL 5/9] softmmu: Provide a clue as to why device tree loading failed Laurent Vivier
2022-01-18 12:28 ` [PULL 6/9] linux-user: Fix comment typo in arm cpu_loop code Laurent Vivier
2022-01-18 12:28 ` Laurent Vivier [this message]
2022-01-18 12:28 ` [PULL 8/9] linux-user: Return void from queue_signal() Laurent Vivier
2022-01-18 12:28 ` [PULL 9/9] linux-user: Remove MAX_SIGQUEUE_SIZE Laurent Vivier
2022-01-19 11:48 ` [PULL 0/9] Trivial branch for 7.0 patches Peter Maydell
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=20220118122847.636461-8-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/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).