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 /target-s390x | |
| parent | 9c279bec754a84c790b70674a5a224379c8dcda2 (diff) | |
| parent | 4ade0541de712fbf151ac7a2403613a1dbdb25b5 (diff) | |
| download | 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 'target-s390x')
| -rw-r--r-- | target-s390x/translate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 82e11658f3..c871ef2bb3 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -37,7 +37,7 @@ #include "exec/cpu_ldst.h" /* global register indexes */ -static TCGv_ptr cpu_env; +static TCGv_env cpu_env; #include "exec/gen-icount.h" #include "exec/helper-proto.h" |