From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 8 Oct 2011 15:38:14 +0000 (+0000)
Subject: Merge branch 'tracing' of git://repo.or.cz/qemu/stefanha
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=211685040f4e579f83a3ed8b3aa7a3f363ad384f;p=qemu.git

Merge branch 'tracing' of git://repo.or.cz/qemu/stefanha

* 'tracing' of git://repo.or.cz/qemu/stefanha:
  trace: add arguments to bdrv_co_io_em() trace event
  trace: trace monitor qmp dispatch/completion
  trace: trace bdrv_open_common()
  hmp: re-enable trace-file command
---

211685040f4e579f83a3ed8b3aa7a3f363ad384f