Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-requ…

…est' into staging Pull request A build fix and a 'simple' trace backend regression fix. # gpg: Signature made Thu 30 Jul 2020 19:13:10 BST # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <[email protected]>" [full] # gpg: aka "Stefan Hajnoczi <[email protected]>" [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/tracing-pull-request: tracetool: carefully define SDT_USE_VARIADIC trace/simple: Allow enabling simple traces from command line Signed-off-by: Peter Maydell <[email protected]>
tx2rx · Jul 30, 2020 · 1448629 · 1448629
2 parents 5772f2b + 0008224
commit 1448629
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py
@@ -44,11 +44,15 @@ def generate_h_begin(events, group):
     # require SDT_USE_VARIADIC to be defined. If dtrace includes <sys/sdt.h>
     # first without defining SDT_USE_VARIADIC then ust breaks because the
     # STAP_PROBEV() macro is not defined.
+    out('#ifndef SDT_USE_VARIADIC')
     out('#define SDT_USE_VARIADIC 1')
+    out('#endif')
 
     out('#include "%s"' % header,
         '')
 
+    out('#undef SDT_USE_VARIADIC')
+
     # SystemTap defines <provider>_<name>_ENABLED() but other DTrace
     # implementations might not.
     for e in events:

diff --git a/trace/control.c b/trace/control.c
@@ -225,6 +225,7 @@ void trace_init_file(const char *file)
 {
 #ifdef CONFIG_TRACE_SIMPLE
     st_set_trace_file(file);
+    st_set_trace_file_enabled(true);
 #elif defined CONFIG_TRACE_LOG
     /*
      * If both the simple and the log backends are enabled, "--trace file"