From e196025698157d7a50d4f5eec20e0777c3a94df3 Mon Sep 17 00:00:00 2001
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Date: Wed, 23 May 2012 11:36:42 +0900
Subject: [PATCH] --- yaml --- r: 309410 b: refs/heads/master c:
 00b9da7219cd027a1c51c3ef576aadbbd9fe38fe h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/tools/lib/traceevent/event-parse.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 670adac4a764..91d5dbf7ab79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e76df19bd986656e3c9f4a62e3dd15e7d69b607a
+refs/heads/master: 00b9da7219cd027a1c51c3ef576aadbbd9fe38fe
diff --git a/trunk/tools/lib/traceevent/event-parse.c b/trunk/tools/lib/traceevent/event-parse.c
index 998534992197..33450c901e17 100644
--- a/trunk/tools/lib/traceevent/event-parse.c
+++ b/trunk/tools/lib/traceevent/event-parse.c
@@ -2124,6 +2124,13 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
 
 		free_token(token);
 		type = process_arg(event, arg, &token);
+
+		if (type == EVENT_OP)
+			type = process_op(event, arg, &token);
+
+		if (type == EVENT_ERROR)
+			goto out_free;
+
 		if (test_type_token(type, token, EVENT_DELIM, ","))
 			goto out_free;