diff options
| author | Peter Maydell | 2016-03-01 16:54:03 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-03-01 16:54:03 +0100 |
| commit | ed6128ebbdd7cd885d39980659dad4b5c8ae8158 (patch) | |
| tree | 0b88379328f6fdfd98db9936d8ca63f8d0f26831 /trace/control.h | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160301' into staging (diff) | |
| parent | trace: Add a proper API to manage auto-generated events from the 'tcg' property (diff) | |
| download | qemu-ed6128ebbdd7cd885d39980659dad4b5c8ae8158.tar.gz qemu-ed6128ebbdd7cd885d39980659dad4b5c8ae8158.tar.xz qemu-ed6128ebbdd7cd885d39980659dad4b5c8ae8158.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Tue 01 Mar 2016 15:48:04 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: Add a proper API to manage auto-generated events from the 'tcg' property
trace: Add 'vcpu' event property to trace guest vCPU
typedefs: Add CPUState
trace: Add helper function to cast event arguments
tcg: Move definition of type TCGv
tcg: Add type for vCPU pointers
trace: Remove unnecessary intermediate event copies
trace: Extend API to manage event arguments
vl: fix tracing initialization
trace: use addresses instead of offsets in memory tracepoints
trace: split subpage MMIOs into their own trace events.
trace: docs: "simple" backend does support strings
trace: drop trailing empty strings
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'trace/control.h')
| -rw-r--r-- | trace/control.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/trace/control.h b/trace/control.h index d5bc86e5f1..f0fe535804 100644 --- a/trace/control.h +++ b/trace/control.h @@ -1,7 +1,7 @@ /* * Interface for configuring and controlling the state of tracing events. * - * Copyright (C) 2011-2014 Lluís Vilanova <vilanova@ac.upc.edu> + * Copyright (C) 2011-2016 Lluís Vilanova <vilanova@ac.upc.edu> * * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. @@ -11,6 +11,7 @@ #define TRACE__CONTROL_H #include "qemu-common.h" +#include "qemu/typedefs.h" #include "trace/generated-events.h" |