diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-25 17:01:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-25 17:01:10 +0000 |
| commit | d132baa05ed7a647067c807fd452ec794cc2ecb7 (patch) | |
| tree | 3cb6fdefdd3e2e86769eca5413328e01f36602a0 /linux-user | |
| parent | 50ccc488b0d4c3b8e2790c18bcd7329fc609a1c6 (diff) | |
| parent | dec9776049e32d6c830127b286530c5f53267eff (diff) | |
| download | qemu-d132baa05ed7a647067c807fd452ec794cc2ecb7.zip qemu-d132baa05ed7a647067c807fd452ec794cc2ecb7.tar.gz qemu-d132baa05ed7a647067c807fd452ec794cc2ecb7.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
Pull request
Compilation fixes and cleanups for QEMU 4.0.0.
# gpg: Signature made Mon 25 Mar 2019 15:58:28 GMT
# gpg: using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
trace-events: Fix attribution of trace points to source
trace-events: Delete unused trace points
scripts/cleanup-trace-events: Update for current practice
trace-events: Shorten file names in comments
trace-events: Consistently point to docs/devel/tracing.txt
trace: avoid SystemTap dtrace(1) warnings on empty files
trace: handle tracefs path truncation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/trace-events | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/trace-events b/linux-user/trace-events index 68f36ac..6df234b 100644 --- a/linux-user/trace-events +++ b/linux-user/trace-events @@ -1,6 +1,7 @@ # See docs/devel/tracing.txt for syntax documentation. -# linux-user/signal.c +# signal.c +# */signal.c 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 |