diff options
author | Peter Maydell | 2018-03-13 10:43:43 +0100 |
---|---|---|
committer | Peter Maydell | 2018-03-13 10:43:44 +0100 |
commit | 73988d529e2edfc0c83cb73c07f818fdfebd633c (patch) | |
tree | 522d73658f6c1023cdee283808d6979363f5fe42 /include/qemu/option.h | |
parent | Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180312-pull-request' ... (diff) | |
parent | trace: only permit standard C types and fixed size integer types (diff) | |
download | qemu-73988d529e2edfc0c83cb73c07f818fdfebd633c.tar.gz qemu-73988d529e2edfc0c83cb73c07f818fdfebd633c.tar.xz qemu-73988d529e2edfc0c83cb73c07f818fdfebd633c.zip |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Mon 12 Mar 2018 15:59:54 GMT
# gpg: using RSA key 9CA4ABB381AB73C8
# 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: only permit standard C types and fixed size integer types
trace: remove use of QEMU specific types from trace probes
trace: include filename when printing parser error messages
simpletrace: fix timestamp argument type
log-for-trace.h: Split out parts of log.h used by trace.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/option.h')
0 files changed, 0 insertions, 0 deletions