aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xentrace/xentrace_format
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2007-11-16 17:05:20 +0000
committerKeir Fraser <keir.fraser@citrix.com>2007-11-16 17:05:20 +0000
commitfec0543a2cb61d16bec0e9b247b7f1afbe1bee72 (patch)
tree3ce5800c9a0da55b136d4b22c3551e9825ca0bbf /tools/xentrace/xentrace_format
parent6d11c3493a4d8cc81ec9dc0f65a459bc45df676e (diff)
downloadxen-fec0543a2cb61d16bec0e9b247b7f1afbe1bee72.tar.gz
xen-fec0543a2cb61d16bec0e9b247b7f1afbe1bee72.tar.bz2
xen-fec0543a2cb61d16bec0e9b247b7f1afbe1bee72.zip
xentrace: Fix TypeError handling of xentrace_format.
Signed-off-by: Yosuke Iwamatsu <y-iwamatsu@ab.jp.nec.com>
Diffstat (limited to 'tools/xentrace/xentrace_format')
-rw-r--r--tools/xentrace/xentrace_format11
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/xentrace/xentrace_format b/tools/xentrace/xentrace_format
index 43ea46ebbe..20fa7718ce 100644
--- a/tools/xentrace/xentrace_format
+++ b/tools/xentrace/xentrace_format
@@ -198,10 +198,15 @@ while not interrupted:
if defs.has_key(str(event)):
print defs[str(event)] % args
else:
- if defs.has_key(str(0)): print defs[str(0)] % args
+ if defs.has_key(str(0)): print defs[str(0)] % args
except TypeError:
- print defs[str(event)]
- print args
+ if defs.has_key(str(event)):
+ print defs[str(event)]
+ print args
+ else:
+ if defs.has_key(str(0)):
+ print defs[str(0)]
+ print args
except IOError, struct.error: sys.exit()