[Qemu-commits] [qemu/qemu] 8b7a55: softmmu: Add missing trace-events file

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8b7a550702f13c2a5999f0871516c0ea54cee781
      
https://github.com/qemu/qemu/commit/8b7a550702f13c2a5999f0871516c0ea54cee781
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M meson.build
    M softmmu/balloon.c
    M softmmu/ioport.c
    M softmmu/memory.c
    A softmmu/trace-events
    A softmmu/trace.h
    M softmmu/vl.c
    M trace-events

  Log Message:
  -----------
  softmmu: Add missing trace-events file

Commit c7f419f584 moved softmmu-only files out of the root
directory, but forgot to move the trace events, which should
no longer be generated to "trace-root.h". Fix that by adding
softmmu/trace-events.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Claudio Fontana <cfontana@suse.de>
Message-id: 20200805130221.24487-1-philmd@redhat.com

[Rebased onto meson.
--Stefan]

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 0807162e601c655e4f08bc736193255a1189d29d
      
https://github.com/qemu/qemu/commit/0807162e601c655e4f08bc736193255a1189d29d
  Author: Roman Bolshakov <r.bolshakov@yadro.com>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M scripts/tracetool/format/d.py

  Log Message:
  -----------
  scripts/tracetool: Fix dtrace generation for macOS

dtrace USDT is fully supported since OS X 10.6. There are a few
peculiarities compared to other dtrace flavors.

1. It doesn't accept empty files.
2. It doesn't recognize bool type but accepts C99 _Bool.
3. It converts int8_t * in probe points to char * in
   header files and introduces [-Wpointer-sign] warning.

Cc: Cameron Esfahani <dirty@apple.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200717093517.73397-2-r.bolshakov@yadro.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 5e7477bc8222230d0675e643c9f8e385e1e6b503
      
https://github.com/qemu/qemu/commit/5e7477bc8222230d0675e643c9f8e385e1e6b503
  Author: Roman Bolshakov <r.bolshakov@yadro.com>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M scripts/tracetool/vcpu.py

  Log Message:
  -----------
  scripts/tracetool: Use void pointer for vcpu

dtrace on macOS complains that CPUState * is used for a few probes:

  dtrace: failed to compile script trace-dtrace-root.dtrace: line 130: syntax 
error near "CPUState"

A comment in scripts/tracetool/__init__.py mentions that:

  We only want to allow standard C types or fixed sized
  integer types. We don't want QEMU specific types
  as we can't assume trace backends can resolve all the
  typedefs

Fixes: 3d211d9f4dbee ("trace: Add 'vcpu' event property to trace guest vCPU")
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Message-id: 20200717093517.73397-3-r.bolshakov@yadro.com
Cc: Cameron Esfahani <dirty@apple.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 8c8ed03850208e486f20ee2902435f1c487792e8
      
https://github.com/qemu/qemu/commit/8c8ed03850208e486f20ee2902435f1c487792e8
  Author: Roman Bolshakov <r.bolshakov@yadro.com>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M net/colo-compare.c
    M net/filter-rewriter.c
    M net/trace-events

  Log Message:
  -----------
  net/colo: Match is-enabled probe to tracepoint

Build of QEMU with dtrace fails on macOS:

  LINK    x86_64-softmmu/qemu-system-x86_64
error: probe colo_compare_miscompare doesn't exist
error: Could not register probes
ld: error creating dtrace DOF section for architecture x86_64

The reason of the error is explained by Adam Leventhal [1]:

  Note that is-enabled probes don't have the stability magic so I'm not
  sure how things would work if only is-enabled probes were used.

net/colo code uses is-enabled probes to determine if other probes should
be used but colo_compare_miscompare itself is not used explicitly.
Linker doesn't include the symbol and build fails.

The issue can be resolved if is-enabled probe matches the actual trace
point that is used inside the test. Packet dump toggle is replaced with
a compile-time conditional definition.

1. http://markmail.org/message/6grq2ygr5nwdwsnb

Fixes: f4b618360e ("colo-compare: add TCP, UDP, ICMP packet comparison")
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Cameron Esfahani <dirty@apple.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Message-id: 20200717093517.73397-5-r.bolshakov@yadro.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 164e7dd73cd8526ff0d0792de75fc646fe0c73fd
      
https://github.com/qemu/qemu/commit/164e7dd73cd8526ff0d0792de75fc646fe0c73fd
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M scripts/cleanup-trace-events.pl

  Log Message:
  -----------
  scripts/cleanup-trace-events: Fix for vcpu property

Commit a44cf524f8 "scripts/cleanup-trace-events: Update for current
practice" limited search to the input file's directory.  That's wrong
for events with the vcpu property, because these can only be defined
in root directory.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 20200806141334.3646302-2-armbru@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: f7dc89c35df0012b84e9d23f71e357f58b66303a
      
https://github.com/qemu/qemu/commit/f7dc89c35df0012b84e9d23f71e357f58b66303a
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M scripts/cleanup-trace-events.pl

  Log Message:
  -----------
  scripts/cleanup-trace-events: Emit files in alphabetical order

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 20200806141334.3646302-3-armbru@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 6ec9379870d409311c7faf5b5316d2e2a8da353f
      
https://github.com/qemu/qemu/commit/6ec9379870d409311c7faf5b5316d2e2a8da353f
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M audio/trace-events
    M block/trace-events
    M hw/misc/trace-events
    M hw/ppc/trace-events
    M hw/timer/trace-events
    M migration/trace-events
    M target/ppc/trace-events

  Log Message:
  -----------
  trace-events: Delete unused trace points

Tracked down with the help of scripts/cleanup-trace-events.pl.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 20200806141334.3646302-4-armbru@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: b15e402fc8861adb65d168d380f39b310599a533
      
https://github.com/qemu/qemu/commit/b15e402fc8861adb65d168d380f39b310599a533
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M block/trace-events
    M hw/block/trace-events
    M hw/char/trace-events
    M hw/display/trace-events
    M hw/hyperv/trace-events
    M hw/mips/trace-events
    M hw/misc/trace-events
    M hw/ppc/trace-events
    M hw/riscv/trace-events
    M hw/rtc/trace-events
    M hw/tpm/trace-events
    M hw/usb/trace-events
    M hw/vfio/trace-events
    M hw/virtio/trace-events
    M migration/trace-events
    M target/riscv/trace-events
    M trace-events
    M ui/trace-events
    M util/trace-events

  Log Message:
  -----------
  trace-events: Fix attribution of trace points to source

Some trace points are attributed to the wrong source file.  Happens
when we neglect to update trace-events for code motion, or add events
in the wrong place, or misspell the file name.

Clean up with help of scripts/cleanup-trace-events.pl.  Funnies
requiring manual post-processing:

* accel/tcg/cputlb.c trace points are in trace-events.

* block.c and blockdev.c trace points are in block/trace-events.

* hw/block/nvme.c uses the preprocessor to hide its trace point use
  from cleanup-trace-events.pl.

* hw/tpm/tpm_spapr.c uses pseudo trace point tpm_spapr_show_buffer to
  guard debug code.

* include/hw/xen/xen_common.h trace points are in hw/xen/trace-events.

* linux-user/trace-events abbreviates a tedious list of filenames to
  */signal.c.

* net/colo-compare and net/filter-rewriter.c use pseudo trace points
  colo_compare_miscompare and colo_filter_rewriter_debug to guard
  debug code.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200806141334.3646302-5-armbru@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 922781b7b37de22a06269f25c9c1ae66293c5991
      
https://github.com/qemu/qemu/commit/922781b7b37de22a06269f25c9c1ae66293c5991
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-10 (Thu, 10 Sep 2020)

  Changed paths:
    M audio/trace-events
    M block/trace-events
    M hw/block/trace-events
    M hw/char/trace-events
    M hw/display/trace-events
    M hw/hyperv/trace-events
    M hw/mips/trace-events
    M hw/misc/trace-events
    M hw/ppc/trace-events
    M hw/riscv/trace-events
    M hw/rtc/trace-events
    M hw/timer/trace-events
    M hw/tpm/trace-events
    M hw/usb/trace-events
    M hw/vfio/trace-events
    M hw/virtio/trace-events
    M meson.build
    M migration/trace-events
    M net/colo-compare.c
    M net/filter-rewriter.c
    M net/trace-events
    M scripts/cleanup-trace-events.pl
    M scripts/tracetool/format/d.py
    M scripts/tracetool/vcpu.py
    M softmmu/balloon.c
    M softmmu/ioport.c
    M softmmu/memory.c
    A softmmu/trace-events
    A softmmu/trace.h
    M softmmu/vl.c
    M target/ppc/trace-events
    M target/riscv/trace-events
    M trace-events
    M ui/trace-events
    M util/trace-events

  Log Message:
  -----------
  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 <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:
  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 <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/9435a8b3dd35...922781b7b37d