diff options
author | Peter Maydell | 2016-07-19 11:54:49 +0200 |
---|---|---|
committer | Peter Maydell | 2016-07-19 11:54:49 +0200 |
commit | 0c1b58f25025cc09463aae235162b19ff45c37b7 (patch) | |
tree | 93f05bbeadc130a91399cc98ac3c914df87958e3 /scripts/tracetool/backend/ust.py | |
parent | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160718.0' i... (diff) | |
parent | trace: Add QAPI/QMP interfaces to query and control per-vCPU tracing state (diff) | |
download | qemu-0c1b58f25025cc09463aae235162b19ff45c37b7.tar.gz qemu-0c1b58f25025cc09463aae235162b19ff45c37b7.tar.xz qemu-0c1b58f25025cc09463aae235162b19ff45c37b7.zip |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Mon 18 Jul 2016 22:59:55 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# 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: Add QAPI/QMP interfaces to query and control per-vCPU tracing state
trace: Allow event name pattern in "info trace-events"
trace: Conditionally trace events based on their per-vCPU state
trace: Add per-vCPU tracing states for events with the 'vcpu' property
trace: Cosmetic changes on fast-path tracing
disas: Remove unused macro '_'
trace: Identify events with the 'vcpu' property
trace: [bsd-user] Commandline arguments to control tracing
trace: [linux-user] Commandline arguments to control tracing
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/tracetool/backend/ust.py')
-rw-r--r-- | scripts/tracetool/backend/ust.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/ust.py index 2f8f44abde..ed4c227f69 100644 --- a/scripts/tracetool/backend/ust.py +++ b/scripts/tracetool/backend/ust.py @@ -6,7 +6,7 @@ LTTng User Space Tracing backend. """ __author__ = "Lluís Vilanova <vilanova@ac.upc.edu>" -__copyright__ = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>" +__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>" __license__ = "GPL version 2 or (at your option) any later version" __maintainer__ = "Stefan Hajnoczi" @@ -30,6 +30,6 @@ def generate_h(event): if len(event.args) > 0: argnames = ", " + argnames - out(' tracepoint(qemu, %(name)s%(tp_args)s);', + out(' tracepoint(qemu, %(name)s%(tp_args)s);', name=event.name, tp_args=argnames) |