-----BEGIN PGP SIGNATURE-----

iQEcBAABAgAGBQJZEHT0AAoJEJykq7OBq3PIEp4IAK+5LKxXnewE/ydHX/8IH7yW
 merXbJNMolk3Q2+nKoTxLSJlmkrU7q6GBC9gM3GxH/slXlwVBoEDgcUG0VblMv1V
 m0MXtc4sq5uv/KzKKhrgyRyaE3sJxNBWUcrxf6Y9UzdCOz4pIoo5NrOBDLJpMVrb
 tQ4f+SdsgGK7KN+N6dISGUb2Pc6H6S1sosflgLdiXoNR+TvLzXm2NrPSZLYMxPdY
 0bQNi25sglT+v+m8m9rsniUyO7itkvb8L3q2XpgOWl0bb3Srdr5Vj5nlNjjuIgdR
 nNqMBylT+8bqGDHLUxsLHi4gTyTeUlrjgzYiGHIzSf5E3zQ10+wHrob5L6rt5M0=
 =Xo6y
 -----END PGP SIGNATURE-----

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>

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: