The following changes since commit 9435a8b3dd35f1f926f1b9127e8a906217a5518a:

  Merge remote-tracking branch 'remotes/kraxel/tags/sirius/ipxe-20200908-pull-request' into staging (2020-09-08 21:21:13 +0100)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to b15e402fc8861adb65d168d380f39b310599a533:

  trace-events: Fix attribution of trace points to source (2020-09-09 17:17:58 +0100)

----------------------------------------------------------------
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)

----------------------------------------------------------------

Markus Armbruster (4):
  scripts/cleanup-trace-events: Fix for vcpu property
  scripts/cleanup-trace-events: Emit files in alphabetical order
  trace-events: Delete unused trace points
  trace-events: Fix attribution of trace points to source

Philippe Mathieu-Daudé (1):
  softmmu: Add missing trace-events file

Roman Bolshakov (3):
  scripts/tracetool: Fix dtrace generation for macOS
  scripts/tracetool: Use void pointer for vcpu
  net/colo: Match is-enabled probe to tracepoint

 softmmu/trace.h                 |  1 +
 net/colo-compare.c              | 42 +++++++++++++++++----------------
 net/filter-rewriter.c           | 10 ++++++--
 softmmu/balloon.c               |  2 +-
 softmmu/ioport.c                |  2 +-
 softmmu/memory.c                |  2 +-
 softmmu/vl.c                    |  2 +-
 audio/trace-events              |  3 ---
 block/trace-events              |  8 ++-----
 hw/block/trace-events           |  2 +-
 hw/char/trace-events            |  2 +-
 hw/display/trace-events         |  4 +++-
 hw/hyperv/trace-events          |  2 +-
 hw/mips/trace-events            |  2 +-
 hw/misc/trace-events            |  9 +++----
 hw/ppc/trace-events             | 10 ++------
 hw/riscv/trace-events           |  2 +-
 hw/rtc/trace-events             |  2 +-
 hw/timer/trace-events           |  1 -
 hw/tpm/trace-events             |  2 +-
 hw/usb/trace-events             |  4 +++-
 hw/vfio/trace-events            | 10 ++++----
 hw/virtio/trace-events          |  2 +-
 meson.build                     |  1 +
 migration/trace-events          | 37 +++++++++++++++--------------
 net/trace-events                |  2 --
 scripts/cleanup-trace-events.pl | 23 +++++++++++-------
 scripts/tracetool/format/d.py   | 15 +++++++++++-
 scripts/tracetool/vcpu.py       |  2 +-
 softmmu/trace-events            | 28 ++++++++++++++++++++++
 target/ppc/trace-events         |  1 -
 target/riscv/trace-events       |  2 +-
 trace-events                    | 32 +++----------------------
 ui/trace-events                 |  6 ++---
 util/trace-events               |  4 +++-
 35 files changed, 151 insertions(+), 128 deletions(-)
 create mode 100644 softmmu/trace.h
 create mode 100644 softmmu/trace-events

-- 
2.26.2

On Thu, 10 Sep 2020 at 09:11, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 9435a8b3dd35f1f926f1b9127e8a906217a5518a:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/sirius/ipxe-20200908-pull-request' into staging (2020-09-08 21:21:13 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to b15e402fc8861adb65d168d380f39b310599a533:
>
>   trace-events: Fix attribution of trace points to source (2020-09-09 17:17:58 +0100)
>
> ----------------------------------------------------------------
> 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)
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.

-- PMM