summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2017-05-08 09:39:48 -0400
committerStefan Hajnoczi <stefanha@redhat.com>2017-05-08 09:40:01 -0400
commit32543dbb67e07afea23ff0eadc4b957b8593eeaa (patch)
tree403546014f0543a2ab2e151c6fdefdb6a9ad10ad
parent4bf43122dbdb62251d502deaaee630fd08a67c6d (diff)
parentf3fddaf60b9b983b82cd11e8087e7c8a3903ee14 (diff)
downloadfocaccia-qemu-32543dbb67e07afea23ff0eadc4b957b8593eeaa.tar.gz
focaccia-qemu-32543dbb67e07afea23ff0eadc4b957b8593eeaa.zip
Merge tag 'tracing-pull-request' into staging
# gpg: Signature made Mon 08 May 2017 09:39:00 AM EDT
# 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

* tag 'tracing-pull-request':
  trace: disallow more than 10 arguments per trace event

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--scripts/tracetool/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 365446fa53..1ffbc1dc40 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -191,6 +191,10 @@ class Event(object):
         self.event_trans = event_trans
         self.event_exec = event_exec
 
+        if len(args) > 10:
+            raise ValueError("Event '%s' has more than maximum permitted "
+                             "argument count" % name)
+
         if orig is None:
             self.original = weakref.ref(self)
         else: