diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-08-15 16:37:17 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-15 16:37:17 +0100 |
| commit | 5c6b3c50cca2106e5fbcbc6efa94c2f8b9d29fd8 (patch) | |
| tree | 130b8de581b48b1bf1862b4f5f1e8001955cc47e /Makefile.objs | |
| parent | f2fb1da9412ae7b4cb512cfbd86c0185f191e2f9 (diff) | |
| parent | 4ac4458076e1aaf3b01a6361154117df20e22215 (diff) | |
| download | qemu-5c6b3c50cca2106e5fbcbc6efa94c2f8b9d29fd8.tar.gz qemu-5c6b3c50cca2106e5fbcbc6efa94c2f8b9d29fd8.tar.bz2 qemu-5c6b3c50cca2106e5fbcbc6efa94c2f8b9d29fd8.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
Tracing pull request
* remotes/stefanha/tags/tracing-pull-request:
virtio-rng: add some trace events
trace: add some tcg tracing support
trace: teach lttng backend to use format strings
trace: [tcg] Include TCG-tracing header on all targets
trace: [tcg] Include event definitions in "trace.h"
trace: [tcg] Generate TCG tracing routines
trace: [tcg] Include TCG-tracing helpers
trace: [tcg] Define TCG tracing helper routine wrappers
trace: [tcg] Define TCG tracing helper routines
trace: [tcg] Declare TCG tracing helper routines
trace: [tcg] Add 'tcg' event property
trace: [tcg] Argument type transformation machinery
trace: [tcg] Argument type transformation rules
trace: [tcg] Add documentation
trace: install simpletrace SystemTap tapset
simpletrace: add simpletrace.py --no-header option
trace: add tracetool simpletrace_stap format
trace: extract stap_escape() function for reuse
Conflicts:
Makefile.objs
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs index efd9768e86..97db978d16 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,7 +1,7 @@ ####################################################################### # Common libraries for tools and emulators stub-obj-y = stubs/ -util-obj-y = util/ qobject/ qapi/ trace/ qapi-types.o qapi-visit.o qapi-event.o +util-obj-y = util/ qobject/ qapi/ qapi-types.o qapi-visit.o qapi-event.o ####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img @@ -101,6 +101,11 @@ version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o version-lobj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.lo ###################################################################### +# tracing +util-obj-y += trace/ +target-obj-y += trace/ + +###################################################################### # guest agent # FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed |