From: Peter Maydell Date: Thu, 10 Sep 2020 10:45:13 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging X-Git-Tag: v5.2.0-rc0~124 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=922781b7b37de22a06269f25c9c1ae66293c5991;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging Pull request v2: * Rebased after meson and resolved conflict in "softmmu: Add missing trace-events file" * Dropped "meson: Don't make object files for dtrace on macOS" (already merged via Paolo's tree) # gpg: Signature made Thu 10 Sep 2020 09:09:47 BST # 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/tags/tracing-pull-request: trace-events: Fix attribution of trace points to source trace-events: Delete unused trace points scripts/cleanup-trace-events: Emit files in alphabetical order scripts/cleanup-trace-events: Fix for vcpu property net/colo: Match is-enabled probe to tracepoint scripts/tracetool: Use void pointer for vcpu scripts/tracetool: Fix dtrace generation for macOS softmmu: Add missing trace-events file Signed-off-by: Peter Maydell --- 922781b7b37de22a06269f25c9c1ae66293c5991