[Qemu-commits] [qemu/qemu] 1b7157: trace/simple: Allow enabling simple traces from co...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1b7157be3a8c4300fc8044d40f4b2e64a152a1b4
      
https://github.com/qemu/qemu/commit/1b7157be3a8c4300fc8044d40f4b2e64a152a1b4
  Author: Josh DuBois <duboisj@gmail.com>
  Date:   2020-07-29 (Wed, 29 Jul 2020)

  Changed paths:
    M trace/control.c

  Log Message:
  -----------
  trace/simple: Allow enabling simple traces from command line

The simple trace backend is enabled / disabled with a call
to st_set_trace_file_enabled().  When initializing tracing
from the command-line, this must be enabled on startup.
(Prior to db25d56c014aa1a9, command-line initialization of
simple trace worked because every call to st_set_trace_file
enabled tracing.)

Fixes: db25d56c014aa1a96319c663e0a60346a223b31e
Signed-off-by: Josh DuBois <josh@joshdubois.com>
Message-id: 20200723053359.256928-1-josh@joshdubois.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 000822441e34916991f7c03217dc24f38be49e50
      
https://github.com/qemu/qemu/commit/000822441e34916991f7c03217dc24f38be49e50
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2020-07-30 (Thu, 30 Jul 2020)

  Changed paths:
    M scripts/tracetool/backend/dtrace.py

  Log Message:
  -----------
  tracetool: carefully define SDT_USE_VARIADIC

The dtrace backend defines SDT_USE_VARIADIC as a workaround for a
conflict with a LTTng UST header file, which requires SDT_USE_VARIADIC
to be defined.

LTTng UST <lttng/tracepoint.h> breaks if included after generated dtrace
headers because SDT_USE_VARIADIC will already be defined:

  #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
  #define SDT_USE_VARIADIC <-- error, it's already defined
  #include <sys/sdt.h>

Be more careful when defining SDT_USE_VARIADIC. This fixes the build
when both the dtrace and ust tracers are enabled at the same time.

Fixes: 27e08bab94f7c6ebe0b75938c98c394c969e3fd8 ("tracetool: work around ust 
<sys/sdt.h> include conflict")
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200729153926.127083-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 1448629751871c4924c234c2faaa968fc26890e1
      
https://github.com/qemu/qemu/commit/1448629751871c4924c234c2faaa968fc26890e1
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-07-30 (Thu, 30 Jul 2020)

  Changed paths:
    M scripts/tracetool/backend/dtrace.py
    M trace/control.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' 
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 <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:
  tracetool: carefully define SDT_USE_VARIADIC
  trace/simple: Allow enabling simple traces from command line

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/5772f2b1fc5d...144862975187