summary refs log tree commit diff stats
path: root/ui/qemu-pixman.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-02-03 19:00:33 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-03 19:00:33 +0000
commit382d34ff9fcc534db32d54eb82590de7c04f9b33 (patch)
treeb8b23b009ff6dba3650a5d16143a919c90436df5 /ui/qemu-pixman.c
parent87574621b18f86eab295a2c207e0b42c77b5dfa0 (diff)
parentc84ea00dc29b2084a62bd31f498ed0f245d3848e (diff)
downloadfocaccia-qemu-382d34ff9fcc534db32d54eb82590de7c04f9b33.tar.gz
focaccia-qemu-382d34ff9fcc534db32d54eb82590de7c04f9b33.zip
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Wed 03 Feb 2016 15:47:34 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/tracing-pull-request:
  log: add "-d trace:PATTERN"
  trace: switch default backend to "log"
  trace: convert stderr backend to log
  log: move qemu-log.c into util/ directory
  log: do not unnecessarily include qom/cpu.h
  trace: add "-trace help"
  trace: add "-trace enable=..."
  trace: no need to call trace_backend_init in different branches now
  trace: split trace_init_file out of trace_init_backends
  trace: split trace_init_events out of trace_init_backends
  trace: fix documentation
  trace: track enabled events in a separate array
  trace: count number of enabled events

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/qemu-pixman.c')
0 files changed, 0 insertions, 0 deletions