starred/qemu-qemu-1
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-04-05 21:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'pr-plugins-20260316' of https://gitlab.com/pbo-linaro/qemu into staging

Browse Source 
Changes:
- [PATCH] contrib/plugins/uftrace.c: fix depth for exit events (Pierrick Bouvier <pierrick.bouvier@linaro.org>)
  Link: https://lore.kernel.org/qemu-devel/20260313063441.2048882-1-pierrick.bouvier@linaro.org

# -----BEGIN PGP SIGNATURE-----
#
# iQGzBAABCgAdFiEEZrmU7KFPfy5auggff5BUDQoc0A8FAmm4kCsACgkQf5BUDQoc
# 0A8gRQv+LZIiG75VL5cy+tpdD+kcwu+hsQ5Y6qGA6zs9TrdARxKtQ2Ozg9VjrMGE
# bTzhxo7ldwEjcki8bvi4yYN3uXtJzg/PODYcN7KWdqihunS97Iqr64Fd5aqkmNkV
# LNBbeLh+9qqtLY/k0YyR5yNJZ+9XuPatG+x/gG7WE0Ij3rMI2y1RIW7oq0MeBVuH
# gY9fsH80CL8wJC+LHkJDwpDXZyFLTh2+Q7kUGk51E3FYDQzHzV8Zewrmy3Vu+1RD
# 1+3EIBbC8e0fjYZEG6FFn0cBjx+TH11y2eN8JRvnmsMqoYRONSd2rUBQG5KFYcvO
# tJzDMCm7rfDWS+URs9SAb0a9mW0QNPBtZhhW5amHVFBQwIxpnznzC+xMCl51GUQe
# 1cNCzUCMhjSkFFUhvbWpB5IjQhDT6vKQ2y+telUDQ3VG1k914slEi2bIBECIEFeu
# u3X/4fCSU25rsXrjadbUKrnahRf9kGWmw1vZoZzGkb95HUpG3mgOXt7n8Ej9q1kt
# RBB/+NwN
# =q1H1
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Mar 16 23:20:11 2026 GMT
# gpg:                using RSA key 66B994ECA14F7F2E5ABA081F7F90540D0A1CD00F
# gpg: Good signature from "Pierrick Bouvier <pierrick.bouvier@linaro.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 66B9 94EC A14F 7F2E 5ABA  081F 7F90 540D 0A1C D00F

* tag 'pr-plugins-20260316' of https://gitlab.com/pbo-linaro/qemu:
  contrib/plugins/uftrace.c: fix depth for exit events

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2026-03-17 10:20:30 +00:00
parent 559919ce54 48221e3716
commit 6667668e0c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/plugins/uftrace.c
View File

@@ -817,7 +817,8 @@ static void track_callstack(unsigned int cpu_index, void *udata)
if (fp == caller.frame_pointer) {
/* return */
CallstackEntry e = callstack_pop(cs);
trace_exit_function(t, timestamp, e.pc, callstack_depth(cs));
/* uftrace convention is to use same depth as entry */
trace_exit_function(t, timestamp, e.pc, callstack_depth(cs) + 1);
return;
}