From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 15 Aug 2014 15:37:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5c6b3c50cca2106e5fbcbc6efa94c2f8b9d29fd8;p=qemu.git

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

5c6b3c50cca2106e5fbcbc6efa94c2f8b9d29fd8
diff --cc Makefile.objs
index efd9768e86,84b86af879..97db978d16
--- a/Makefile.objs
+++ b/Makefile.objs
@@@ -1,7 -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/
++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