diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-01 15:54:03 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-01 15:54:03 +0000 |
| commit | ed6128ebbdd7cd885d39980659dad4b5c8ae8158 (patch) | |
| tree | 0b88379328f6fdfd98db9936d8ca63f8d0f26831 /include/qom/cpu.h | |
| parent | 9c279bec754a84c790b70674a5a224379c8dcda2 (diff) | |
| parent | 4ade0541de712fbf151ac7a2403613a1dbdb25b5 (diff) | |
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 'include/qom/cpu.h')
| -rw-r--r-- | include/qom/cpu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 1df7cb4073..7052eee7b7 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -62,7 +62,6 @@ typedef uint64_t vaddr; #define CPU_CLASS(class) OBJECT_CLASS_CHECK(CPUClass, (class), TYPE_CPU) #define CPU_GET_CLASS(obj) OBJECT_GET_CLASS(CPUClass, (obj), TYPE_CPU) -typedef struct CPUState CPUState; typedef struct CPUWatchpoint CPUWatchpoint; typedef void (*CPUUnassignedAccess)(CPUState *cpu, hwaddr addr, |