diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-02-06 13:46:12 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-02-06 13:46:12 +0000 |
commit | b93acb92cad1f38737e481fc85cb5c41a559d855 (patch) | |
tree | 4ba6b04adb2e994d01e6119d5902cfdeb17ea64a /block/vhdx.h | |
parent | b3cd91e0eaf5c962cf139ce6ca59392c8b00f177 (diff) | |
parent | dd9fe29c80b8a35f12d98928a97be3aded80cf69 (diff) | |
download | qemu-b93acb92cad1f38737e481fc85cb5c41a559d855.zip qemu-b93acb92cad1f38737e481fc85cb5c41a559d855.tar.gz qemu-b93acb92cad1f38737e481fc85cb5c41a559d855.tar.bz2 |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Fri 06 Feb 2015 13:45:06 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:
trace: Print PID and time in stderr traces
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/vhdx.h')
0 files changed, 0 insertions, 0 deletions