Google Git
Sign in
qemu / qemu / 4e9f5244e1945b2852b9ddcd7f023a7d19c9ecd7
commit4e9f5244e1945b2852b9ddcd7f023a7d19c9ecd7[log] [tgz]
authorPeter Maydell <peter.maydell@linaro.org>Thu Feb 02 16:08:28 2017 +0000
committerPeter Maydell <peter.maydell@linaro.org>Thu Feb 02 16:08:28 2017 +0000
tree857fc18ea95112a807196ff0af7b9202109aba2c
parent0b17d809b08e0315430d2e2923dbe4e967ef4f63 [diff]
parent7f4076c1bb16d0d6f81a085ecc9c9d0b9da74c7d [diff]
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>
tree: 857fc18ea95112a807196ff0af7b9202109aba2c
  1. audio/
  2. backends/
  3. block/
  4. bsd-user/
  5. chardev/
  6. contrib/
  7. crypto/
  8. default-configs/
  9. disas/
  10. docs/
  11. fpu/
  12. fsdev/
  13. gdb-xml/
  14. hw/
  15. include/
  16. io/
  17. libdecnumber/
  18. linux-headers/
  19. linux-user/
  20. migration/
  21. nbd/
  22. net/
  23. pc-bios/
  24. po/
  25. qapi/
  26. qga/
  27. qobject/
  28. qom/
  29. replay/
  30. roms/
  31. scripts/
  32. slirp/
  33. stubs/
  34. target/
  35. tcg/
  36. tests/
  37. trace/
  38. ui/
  39. util/
  40. dtc
  41. pixman
  42. .dir-locals.el
  43. .exrc
  44. .gitignore
  45. .gitmodules
  46. .mailmap
  47. .travis.yml
  48. accel.c
  49. aio-posix.c
  50. aio-win32.c
  51. arch_init.c
  52. async.c
  53. atomic_template.h
  54. balloon.c
  55. block.c
  56. blockdev-nbd.c
  57. blockdev.c
  58. blockjob.c
  59. bootdevice.c
  60. bt-host.c
  61. bt-vhci.c
  62. Changelog
  63. CODING_STYLE
  64. configure
  65. COPYING
  66. COPYING.LIB
  67. cpu-exec-common.c
  68. cpu-exec.c
  69. cpus-common.c
  70. cpus.c
  71. cputlb.c
  72. device-hotplug.c
  73. device_tree.c
  74. disas.c
  75. dma-helpers.c
  76. dump.c
  77. exec.c
  78. gdbstub.c
  79. HACKING
  80. hax-stub.c
  81. hmp-commands-info.hx
  82. hmp-commands.hx
  83. hmp.c
  84. hmp.h
  85. iohandler.c
  86. ioport.c
  87. iothread.c
  88. kvm-all.c
  89. kvm-stub.c
  90. LICENSE
  91. main-loop.c
  92. MAINTAINERS
  93. Makefile
  94. Makefile.objs
  95. Makefile.target
  96. memory.c
  97. memory_ldst.inc.c
  98. memory_mapping.c
  99. module-common.c
  100. monitor.c
  101. numa.c
  102. os-posix.c
  103. os-win32.c
  104. page_cache.c
  105. qapi-schema.json
  106. qdev-monitor.c
  107. qdict-test-data.txt
  108. qemu-bridge-helper.c
  109. qemu-doc.texi
  110. qemu-ga.texi
  111. qemu-img-cmds.hx
  112. qemu-img.c
  113. qemu-img.texi
  114. qemu-io-cmds.c
  115. qemu-io.c
  116. qemu-nbd.c
  117. qemu-nbd.texi
  118. qemu-option-trace.texi
  119. qemu-options-wrapper.h
  120. qemu-options.h
  121. qemu-options.hx
  122. qemu-seccomp.c
  123. qemu-tech.texi
  124. qemu-timer.c
  125. qemu.nsi
  126. qemu.sasl
  127. qmp.c
  128. qtest.c
  129. README
  130. replication.c
  131. replication.h
  132. rules.mak
  133. softmmu_template.h
  134. spice-qemu-char.c
  135. tcg-runtime.c
  136. tci.c
  137. thread-pool.c
  138. thunk.c
  139. tpm.c
  140. trace-events
  141. translate-all.c
  142. translate-all.h
  143. translate-common.c
  144. user-exec-stub.c
  145. user-exec.c
  146. VERSION
  147. version.rc
  148. vl.c
  149. xen-common-stub.c
  150. xen-common.c
  151. xen-hvm-stub.c
  152. xen-hvm.c
  153. xen-mapcache.c