8 files changed, 115 insertions, 56 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6dc67b1fdb50..80399fff805d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6782,7 +6782,7 @@ PERFORMANCE EVENTS SUBSYSTEM
 M:      Peter Zijlstra <a.p.zijlstra@chello.nl>
 M:      Paul Mackerras <paulus@samba.org>
 M:      Ingo Molnar <mingo@redhat.com>
-M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
+M:      Arnaldo Carvalho de Melo <acme@kernel.org>
 L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 S:      Supported
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 1587ea392ad6..baec7d887da4 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -50,6 +50,18 @@ static int show_warning = 1;
                         warning(fmt, ##__VA_ARGS__);    \
         } while (0)
 
+#define do_warning_event(event, fmt, ...)                       \
+        do {                                                    \
+                if (!show_warning)                              \
+                        continue;                               \
+                                                                \
+                if (event)                                      \
+                        warning("[%s:%s] " fmt, event->system,  \
+                                event->name, ##__VA_ARGS__);    \
+                else                                            \
+                        warning(fmt, ##__VA_ARGS__);            \
+        } while (0)
+
 static void init_input_buf(const char *buf, unsigned long long size)
 {
         input_buf = buf;
@@ -1355,7 +1367,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
                 }
 
                 if (!field->type) {
-                        do_warning("%s: no type found", __func__);
+                        do_warning_event(event, "%s: no type found", __func__);
                         goto fail;
                 }
                 field->name = last_token;
@@ -1402,7 +1414,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
                                 free_token(token);
                                 type = read_token(&token);
                                 if (type == EVENT_NONE) {
-                                        do_warning("failed to find token");
+                                        do_warning_event(event, "failed to find token");
                                         goto fail;
                                 }
                         }
@@ -1636,7 +1648,7 @@ process_cond(struct event_format *event, struct print_arg *top, char **tok)
         right = alloc_arg();
 
         if (!arg || !left || !right) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 /* arg will be freed at out_free */
                 free_arg(left);
                 free_arg(right);
@@ -1686,7 +1698,7 @@ process_array(struct event_format *event, struct print_arg *top, char **tok)
 
         arg = alloc_arg();
         if (!arg) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 /* '*tok' is set to top->op.op.  No need to free. */
                 *tok = NULL;
                 return EVENT_ERROR;
@@ -1792,7 +1804,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
         if (arg->type == PRINT_OP && !arg->op.left) {
                 /* handle single op */
                 if (token[1]) {
-                        do_warning("bad op token %s", token);
+                        do_warning_event(event, "bad op token %s", token);
                         goto out_free;
                 }
                 switch (token[0]) {
@@ -1802,7 +1814,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
                 case '-':
                         break;
                 default:
-                        do_warning("bad op token %s", token);
+                        do_warning_event(event, "bad op token %s", token);
                         goto out_free;
 
                 }
@@ -1888,7 +1900,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
                         char *new_atom;
 
                         if (left->type != PRINT_ATOM) {
-                                do_warning("bad pointer type");
+                                do_warning_event(event, "bad pointer type");
                                 goto out_free;
                         }
                         new_atom = realloc(left->atom.atom,
@@ -1930,7 +1942,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
                 type = process_array(event, arg, tok);
 
         } else {
-                do_warning("unknown op '%s'", token);
+                do_warning_event(event, "unknown op '%s'", token);
                 event->flags |= EVENT_FL_FAILED;
                 /* the arg is now the left side */
                 goto out_free;
@@ -1951,7 +1963,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
         return type;
 
 out_warn_free:
-        do_warning("%s: not enough memory!", __func__);
+        do_warning_event(event, "%s: not enough memory!", __func__);
 out_free:
         free_token(token);
         *tok = NULL;
@@ -2385,7 +2397,7 @@ process_flags(struct event_format *event, struct print_arg *arg, char **tok)
 
         field = alloc_arg();
         if (!field) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 goto out_free;
         }
 
@@ -2438,7 +2450,7 @@ process_symbols(struct event_format *event, struct print_arg *arg, char **tok)
 
         field = alloc_arg();
         if (!field) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 goto out_free;
         }
 
@@ -2477,7 +2489,7 @@ process_hex(struct event_format *event, struct print_arg *arg, char **tok)
 
         field = alloc_arg();
         if (!field) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 goto out_free;
         }
 
@@ -2492,7 +2504,7 @@ process_hex(struct event_format *event, struct print_arg *arg, char **tok)
 
         field = alloc_arg();
         if (!field) {