[Qemu-commits] [qemu/qemu] 27e08b: tracetool: work around ust <sys/sdt.h> include con...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 27e08bab94f7c6ebe0b75938c98c394c969e3fd8
      
https://github.com/qemu/qemu/commit/27e08bab94f7c6ebe0b75938c98c394c969e3fd8
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

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

  Log Message:
  -----------
  tracetool: work around ust <sys/sdt.h> include conflict

Both the dtrace and ust backends may include <sys/sdt.h> but LTTng
Userspace Tracer 2.11 and later requires SDT_USE_VARIADIC to be defined
before including the header file.

This is a classic problem with C header files included from different
parts of a program. If the same header is included twice within the same
compilation unit then the first inclusion determines the macro
environment.

Work around this by defining SDT_USE_VARIADIC in the dtrace backend too.
It doesn't hurt and fixes a missing STAP_PROBEV() compiler error when
the ust backend is enabled together with the dtrace backend.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200625140757.237012-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: b6d7e9b66f59ca6ebc6e9b830cd5e7bf849d31cf
      
https://github.com/qemu/qemu/commit/b6d7e9b66f59ca6ebc6e9b830cd5e7bf849d31cf
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-07-10 (Fri, 10 Jul 2020)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' 
into staging

Pull request

Fix for a LTTng Userspace Tracer header problem.

# gpg: Signature made Tue 07 Jul 2020 16:10:04 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: work around ust <sys/sdt.h> include conflict

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


Compare: https://github.com/qemu/qemu/compare/aecdfcc3f849...b6d7e9b66f59