On Fri, Sep 25, 2015 at 03:21:18AM +0000, He Kuang wrote:
SNIP
> static int config_attr(struct perf_event_attr *attr,
> struct list_head *head,
> - struct parse_events_error *err)
> + struct parse_events_error *err,
> + config_term_func_t config_term)
> {
> struct parse_events_term *term;
>
> @@ -735,7 +751,8 @@ int parse_events_add_numeric(struct parse_events_evlist
> *data,
> attr.config = config;
>
> if (head_config) {
> - if (config_attr(&attr, head_config, data->error))
> + if (config_attr(&attr, head_config, data->error,
> + config_term_common))
> return -EINVAL;
>
> if (get_config_terms(head_config, &config_terms))
> @@ -795,7 +812,7 @@ int parse_events_add_pmu(struct parse_events_evlist *data,
> * Configure hardcoded terms first, no need to check
> * return value when called with fail == 0 ;)
> */
> - if (config_attr(&attr, head_config, data->error))
> + if (config_attr(&attr, head_config, data->error, config_term_pmu))
> return -EINVAL;
>
> if (get_config_terms(head_config, &config_terms))
> @@ -1861,3 +1878,26 @@ void parse_events_evlist_error(struct
> parse_events_evlist *data,
> err->str = strdup(str);
> WARN_ONCE(!err->str, "WARNING: failed to allocate error string");
could you please plit this into the part that adds the
config_term callback and the error message formating change?
thanks,
jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
