From: Peter Maydell Date: Tue, 5 Jan 2021 13:09:10 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/tracing-pull-request'... X-Git-Tag: v6.0.0-rc0~162 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74a0a6fcecb9e31bc60875b57c69db537ad385d1;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/tracing-pull-request' into staging Pull request Show trace-events filename/lineno in fmt string errors and send -d trace:help output to stdout for consistency. # gpg: Signature made Mon 04 Jan 2021 14:26:58 GMT # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi " [full] # gpg: aka "Stefan Hajnoczi " [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha-gitlab/tags/tracing-pull-request: tracetool: show trace-events filename/lineno in fmt string errors tracetool: add input filename and line number to Event tracetool: add out_lineno and out_next_lineno to out() tracetool: add output filename command-line argument trace: Send "-d trace:help" output to stdout Signed-off-by: Peter Maydell --- 74a0a6fcecb9e31bc60875b57c69db537ad385d1