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

diff --combined Makefile
index c5751b879a7d8f2d49cec8dea54bf26bd1347d8a,20b697ec4cfab55fe3abbf082a7e8da3c096bde8..b33aaacde61b164c486d47e48e9322b2ab2867b4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -57,6 -57,12 +57,12 @@@ GENERATED_HEADERS += trace/generated-tr
  endif
  GENERATED_SOURCES += trace/generated-tracers.c
  
+ GENERATED_HEADERS += trace/generated-tcg-tracers.h
+ 
+ GENERATED_HEADERS += trace/generated-helpers-wrappers.h
+ GENERATED_HEADERS += trace/generated-helpers.h
+ GENERATED_SOURCES += trace/generated-helpers.c
+ 
  ifeq ($(findstring ust,$(TRACE_BACKENDS)),ust)
  GENERATED_HEADERS += trace/generated-ust-provider.h
  GENERATED_SOURCES += trace/generated-ust.c
@@@ -202,7 -208,7 +208,7 @@@ Makefile: $(version-obj-y) $(version-lo
  # Build libraries
  
  libqemustub.a: $(stub-obj-y)
 -libqemuutil.a: $(util-obj-y) qapi-types.o qapi-visit.o qapi-event.o
 +libqemuutil.a: $(util-obj-y)
  
  block-modules = $(foreach o,$(block-obj-m),"$(basename $(subst /,-,$o))",) NULL
  util/module.o-cflags = -D'CONFIG_BLOCK_MODULES=$(block-modules)'

diff --combined Makefile.objs
index efd9768e8611018e256b3b8640b8a0d57c47ce74,84b86af879e33b57f12019265de8d6544003f2ab..97db978d16100464ddef367c285277f1a01ae86c
--- 1/Makefile.objs
--- 2/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
@@@ -12,6 -12,7 +12,6 @@@ block-obj-y += main-loop.o iohandler.o 
  block-obj-$(CONFIG_POSIX) += aio-posix.o
  block-obj-$(CONFIG_WIN32) += aio-win32.o
  block-obj-y += block/
 -block-obj-y += qapi-types.o qapi-visit.o qapi-event.o
  block-obj-y += qemu-io-cmds.o
  
  block-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o
@@@ -87,6 -88,11 +87,6 @@@ common-obj-y += qmp-marshal.
  common-obj-y += qmp.o hmp.o
  endif
  
 -######################################################################
 -# some qapi visitors are used by both system and user emulation:
 -
 -common-obj-y += qapi-visit.o qapi-types.o
 -
  #######################################################################
  # Target-independent parts used in system and user emulation
  common-obj-y += qemu-log.o
@@@ -100,10 -106,15 +100,15 @@@ common-obj-y += disas
  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
  # by libqemuutil.a.  These should be moved to a separate .json schema.
 -qga-obj-y = qga/ qapi-types.o qapi-visit.o
 +qga-obj-y = qga/
  qga-vss-dll-obj-y = qga/