Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

# gpg: Signature made Wed 01 Feb 2017 13:44:32 GMT
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: clean up trace-events files
  qapi: add missing trace_visit_type_enum() call
  trace: improve error reporting when parsing simpletrace header
  trace: update docs to reflect new code generation approach
  trace: switch to modular code generation for sub-directories
  trace: move setting of group name into Makefiles
  trace: move hw/i386/xen events to correct subdir
  trace: move hw/xen events to correct subdir
  trace: move hw/block/dataplane events to correct subdir
  make: move top level dir to end of include search path

# Conflicts:
#	Makefile

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --cc Makefile
index aef76221f5aa216bbb1f12574ca8a2160ca6fb7d,3ad4bc2f17b4fef388bd10a430e03dcd0a2466de..4b72a4ca562f64264bd456f524c323a41f8bda73
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -224,8 -335,7 +336,8 @@@ subdir-dtc:dtc/libfdt dtc/test
  dtc/%:
        mkdir -p $@
  
 -$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) $(trace-obj-y)
 +$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(chardev-obj-y) \
-       $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))
++      $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) $(trace-obj-y)
  
  ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
  # Only keep -O and -g cflags

diff --cc Makefile.objs
Simple merge

diff --cc Makefile.target
Simple merge

diff --cc monitor.c
Simple merge

diff --cc spice-qemu-char.c
Simple merge

diff --cc tests/Makefile.include
Simple merge