The following changes since commit 627eae7d729277c84f8e0ac07a8caab39c92c38d:
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2016-10-10 16:23:40 +0100) are available in the git repository at: git://github.com/stefanha/qemu.git tags/tracing-pull-request for you to fetch changes up to f5e2b3be82ec7e2ec8fed37da3fb2da469ae7d4b: trace: Add missing execution mode of guest events (2016-10-12 09:54:53 +0200) ---------------------------------------------------------------- ---------------------------------------------------------------- Daniel P. Berrange (19): trace: move colo trace events to net/ sub-directory trace: add trace event iterator APIs trace: convert code to use event iterators trace: remove some now unused functions trace: remove global 'uint16 dstate[]' array trace: remove duplicate control.h includes in generated-tracers.h trace: break circular dependency in event-internal.h trace: give each trace event a named TraceEvent struct trace: remove the TraceEventID and TraceEventVCPUID enums trace: emit name <-> ID mapping in simpletrace header trace: don't abort qemu if ftrace can't be initialized trace: provide mechanism for registering trace events trace: dynamically allocate trace_dstate in CPUState trace: dynamically allocate event IDs at runtime trace: get rid of generated-events.h/generated-events.c trace: rename _read_events to read_events trace: push reading of events up a level to tracetool main trace: pass trace-events to tracetool as a positional param trace: introduce a formal group name for trace events Lluís Vilanova (1): trace: Add missing execution mode of guest events Makefile | 3 - Makefile.target | 6 +- bsd-user/main.c | 1 + include/qemu/module.h | 2 + include/qom/cpu.h | 9 +- include/trace-tcg.h | 1 - include/trace.h | 1 - linux-user/main.c | 1 + monitor.c | 26 ++--- net/trace-events | 16 +++ qemu-img.c | 1 + qemu-io.c | 1 + qemu-nbd.c | 1 + qom/cpu.c | 7 +- scripts/simpletrace.py | 56 +++++++---- scripts/tracetool.py | 20 +++- scripts/tracetool/__init__.py | 28 ++++-- scripts/tracetool/backend/__init__.py | 12 +-- scripts/tracetool/backend/dtrace.py | 4 +- scripts/tracetool/backend/ftrace.py | 5 +- scripts/tracetool/backend/log.py | 7 +- scripts/tracetool/backend/simple.py | 12 +-- scripts/tracetool/backend/syslog.py | 5 +- scripts/tracetool/backend/ust.py | 4 +- scripts/tracetool/format/__init__.py | 4 +- scripts/tracetool/format/c.py | 56 +++++++++-- scripts/tracetool/format/d.py | 2 +- scripts/tracetool/format/events_c.py | 44 -------- scripts/tracetool/format/events_h.py | 60 ----------- scripts/tracetool/format/h.py | 37 +++++-- scripts/tracetool/format/simpletrace_stap.py | 26 ++++- scripts/tracetool/format/stap.py | 2 +- scripts/tracetool/format/tcg_h.py | 8 +- scripts/tracetool/format/tcg_helper_c.py | 2 +- scripts/tracetool/format/tcg_helper_h.py | 2 +- scripts/tracetool/format/tcg_helper_wrapper_h.py | 2 +- scripts/tracetool/format/ust_events_c.py | 2 +- scripts/tracetool/format/ust_events_h.py | 9 +- stubs/trace-control.c | 9 +- trace-events | 18 +--- trace/Makefile.objs | 46 +++------ trace/control-internal.h | 48 ++++----- trace/control-target.c | 35 +++---- trace/control.c | 123 +++++++++++++++-------- trace/control.h | 112 +++++++-------------- trace/event-internal.h | 18 +++- trace/ftrace.c | 6 ++ trace/qmp.c | 16 +-- trace/simple.c | 41 ++++++-- trace/simple.h | 6 +- vl.c | 2 + 51 files changed, 504 insertions(+), 461 deletions(-) delete mode 100644 scripts/tracetool/format/events_c.py delete mode 100644 scripts/tracetool/format/events_h.py -- 2.7.4
