Failed in applying to current master (
apply log)
docs/tracing.txt | 51 ++++++++--
Makefile | 156 ++++++++++++++++++++++++++----
Makefile.objs | 99 ++++++++++---------
Makefile.target | 10 +-
tests/Makefile.include | 2 +-
trace/Makefile.objs | 93 ++----------------
include/exec/cpu_ldst_template.h | 2 +-
include/exec/cpu_ldst_useronly_template.h | 2 +-
include/hw/xen/xen_common.h | 2 +-
include/trace.h | 6 --
aio-posix.c | 2 +-
balloon.c | 2 +-
block.c | 2 +-
blockdev-nbd.c | 1 -
blockdev.c | 2 +-
blockjob.c | 1 -
cpu-exec.c | 2 +-
dma-helpers.c | 2 +-
exec.c | 2 +-
hw/net/fsl_etsec/etsec.c | 1 -
ioport.c | 2 +-
kvm-all.c | 2 +-
memory.c | 2 +-
monitor.c | 2 +-
qapi/qapi-visit-core.c | 1 +
qom/cpu.c | 2 +-
spice-qemu-char.c | 2 +-
thread-pool.c | 2 +-
trace/control-target.c | 2 +-
trace/control.c | 2 +-
trace/ftrace.c | 2 +-
trace/simple.c | 1 -
translate-all.c | 2 +-
vl.c | 2 +-
xen-hvm.c | 2 +-
xen-mapcache.c | 2 +-
.gitignore | 22 +++--
block/trace-events | 2 -
hw/block/dataplane/trace-events | 5 +
hw/block/trace-events | 5 -
hw/display/trace-events | 1 -
hw/i386/trace-events | 8 --
hw/i386/xen/trace-events | 6 ++
hw/input/trace-events | 2 -
hw/intc/trace-events | 1 -
hw/net/trace-events | 8 --
hw/usb/trace-events | 1 -
hw/vfio/trace-events | 2 +-
hw/xen/trace-events | 13 +++
migration/trace-events | 3 -
qapi/trace-events | 2 +-
rules.mak | 30 ++++--
scripts/simpletrace.py | 10 +-
scripts/tracetool.py | 31 +++---
scripts/tracetool/backend/dtrace.py | 7 +-
scripts/tracetool/backend/simple.py | 1 -
scripts/tracetool/backend/ust.py | 7 +-
scripts/tracetool/format/c.py | 7 +-
scripts/tracetool/format/tcg_h.py | 6 +-
scripts/tracetool/format/tcg_helper_c.py | 6 +-
scripts/tracetool/format/ust_events_c.py | 2 +-
scripts/tracetool/format/ust_events_h.py | 7 +-
trace-events | 11 ---
63 files changed, 398 insertions(+), 278 deletions(-)
delete mode 100644 include/trace.h
create mode 100644 hw/block/dataplane/trace-events
create mode 100644 hw/i386/xen/trace-events
create mode 100644 hw/xen/trace-events