From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Date: Thu, 25 Aug 2011 17:03:49 +0000 (+0100)
Subject: simpletrace: fix process() argument count
X-Git-Tag: v1.0-rc0~365^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8e8ef4ee05bfee0df84e2665d9196c4a954c095;p=thirdparty%2Fqemu.git

simpletrace: fix process() argument count

The simpletrace.process() function invokes analyzer methods with the
wrong number of arguments if a timestamp should be included.  This patch
fixes the issue so that trace analysis scripts can make use of
timestamps.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---

diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
index 2ad56998ee6..f55e5e63f9f 100755
--- a/scripts/simpletrace.py
+++ b/scripts/simpletrace.py
@@ -102,10 +102,10 @@ def process(events, log, analyzer):
         fn_argcount = len(inspect.getargspec(fn)[0]) - 1
         if fn_argcount == event_argcount + 1:
             # Include timestamp as first argument
-            return lambda _, rec: fn(*rec[1:2 + fn_argcount])
+            return lambda _, rec: fn(*rec[1:2 + event_argcount])
         else:
             # Just arguments, no timestamp
-            return lambda _, rec: fn(*rec[2:2 + fn_argcount])
+            return lambda _, rec: fn(*rec[2:2 + event_argcount])
 
     analyzer.begin()
     fn_cache = {}