From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755100AbbIYIPn (ORCPT <rfc822;w@1wt.eu>);
	Fri, 25 Sep 2015 04:15:43 -0400
Received: from mx1.redhat.com ([209.132.183.28]:46000 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752979AbbIYIPk (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 25 Sep 2015 04:15:40 -0400
Date: Fri, 25 Sep 2015 10:15:32 +0200
From: Jiri Olsa <jolsa@redhat.com>
To: He Kuang <hekuang@huawei.com>
Cc: a.p.zijlstra@chello.nl, mingo@redhat.com, acme@kernel.org,
        jolsa@kernel.org, kan.liang@intel.com, adrian.hunter@intel.com,
        wangnan0@huawei.com, pi3orama@163.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] perf tools: Prompt error message for wrong terms of
 hw/sw events
Message-ID: <20150925081532.GD21290@krava.redhat.com>
References: <1443151279-141093-1-git-send-email-hekuang@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1443151279-141093-1-git-send-email-hekuang@huawei.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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