Get rid of mc_event_error_type

Somehow, the tracing library is not finding it on some systems:
overriding event (710) ras:mc_event with new print handler
trace-cmd: File exists
  function mc_event_error_type not defined

Let's just get rid of it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/libtrace/event-parse.c b/libtrace/event-parse.c
index 8fa6ec97087d4d47a28a6675b8d7a99fb7a093f2..8afb9baf97fd1d15af802eb1b83fc7f862718948 100644 (file)
--- a/libtrace/event-parse.c
+++ b/libtrace/event-parse.c
@@ -2688,6 +2688,8 @@ process_function(struct event_format *event, struct print_arg *arg,
 {
        struct pevent_function_handler *func;
 
+printf("Processing function %s\n", token);
+
        if (strcmp(token, "__print_flags") == 0) {
                free_token(token);
                is_flag_field = 1;

diff --git a/ras-aer-handler.c b/ras-aer-handler.c
index a9d5a3997efc4ed71c8e9bb05d9e81446d47e7a5..6f13fbf9e6884fa491c1cf6ec4eac1a6fa4c7189 100644 (file)
--- a/ras-aer-handler.c
+++ b/ras-aer-handler.c
@@ -93,7 +93,20 @@ int ras_aer_event_handler(struct trace_seq *s,
 
        if (pevent_get_field_val(s, event, "severity", record, &val, 1) < 0)
                return -1;
-       ev.error_type = mc_event_error_type(val);
+       switch (val) {
+       case HW_EVENT_ERR_CORRECTED:
+               ev.error_type = "Corrected";
+               break;
+       case HW_EVENT_ERR_UNCORRECTED:
+               ev.error_type = "Uncorrected";
+               break;
+       case HW_EVENT_ERR_FATAL:
+               ev.error_type = "Fatal";
+               break;
+       default:
+       case HW_EVENT_ERR_INFO:
+               ev.error_type = "Info";
+       }
        trace_seq_puts(s, ev.error_type);
 
        /* Insert data into the SGBD */

diff --git a/ras-events.c b/ras-events.c
index 95fb09701e92ba571e030421285bf0e0a0fe0f2d..ab82c54cacfcceae18970af417a933e113e0e633 100644 (file)
--- a/ras-events.c
+++ b/ras-events.c
@@ -202,21 +202,6 @@ free_ras:
  * Tracing read code
  */
 
-char *mc_event_error_type(unsigned long long err_type)
-{
-       switch (err_type) {
-       case HW_EVENT_ERR_CORRECTED:
-               return "Corrected";
-       case HW_EVENT_ERR_UNCORRECTED:
-               return "Uncorrected";
-       case HW_EVENT_ERR_FATAL:
-               return "Fatal";
-       default:
-       case HW_EVENT_ERR_INFO:
-               return "Info";
-       }
-}
-
 static int get_pagesize(struct ras_events *ras, struct pevent *pevent)
 {
        int fd, len, page_size = 4096;

diff --git a/ras-events.h b/ras-events.h
index 22d286533e0c7ebf52d611b16d741ba4923c5c18..f29970b656c4ba92b2fcf26ddc086381d8abbfd9 100644 (file)
--- a/ras-events.h
+++ b/ras-events.h
@@ -68,6 +68,5 @@ enum hw_event_mc_err_type {
 /* Function prototypes */
 int toggle_ras_mc_event(int enable);
 int handle_ras_events(int record_events);
-char *mc_event_error_type(unsigned long long err_type);
 
 #endif

diff --git a/ras-mc-handler.c b/ras-mc-handler.c
index 8fd1fb0ea0a7cb22d43db292d745a52cc53e5912..5c24f658b117ad06679b078b97ea8c554c37035e 100644 (file)
--- a/ras-mc-handler.c
+++ b/ras-mc-handler.c
@@ -67,7 +67,21 @@ int ras_mc_event_handler(struct trace_seq *s,
                goto parse_error;
        parsed_fields++;
 
-       ev.error_type = mc_event_error_type(val);
+       switch (val) {
+       case HW_EVENT_ERR_CORRECTED:
+               ev.error_type = "Corrected";
+               break;
+       case HW_EVENT_ERR_UNCORRECTED:
+               ev.error_type = "Uncorrected";
+               break;
+       case HW_EVENT_ERR_FATAL:
+               ev.error_type = "Fatal";
+               break;
+       default:
+       case HW_EVENT_ERR_INFO:
+               ev.error_type = "Info";
+       }
+
        trace_seq_puts(s, ev.error_type);
        if (ev.error_count > 1)
                trace_seq_puts(s, " errors:");