From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7909BC433F4 for ; Thu, 30 Aug 2018 08:59:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3797A2054F for ; Thu, 30 Aug 2018 08:59:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3797A2054F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728083AbeH3NA1 (ORCPT ); Thu, 30 Aug 2018 09:00:27 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41498 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727720AbeH3NA0 (ORCPT ); Thu, 30 Aug 2018 09:00:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A4AFF804BAAC; Thu, 30 Aug 2018 08:59:19 +0000 (UTC) Received: from krava (unknown [10.43.17.209]) by smtp.corp.redhat.com (Postfix) with SMTP id 9C35D112D170; Thu, 30 Aug 2018 08:59:18 +0000 (UTC) Date: Thu, 30 Aug 2018 10:59:18 +0200 From: Jiri Olsa To: Andi Kleen Cc: acme@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, Andi Kleen Subject: Re: [PATCH v1 06/10] tools, perf, script: Set user_set/wildcard_set for +- fields in -F Message-ID: <20180830085918.GG16691@krava> References: <20180829171834.6590-1-andi@firstfloor.org> <20180829171834.6590-7-andi@firstfloor.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180829171834.6590-7-andi@firstfloor.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 30 Aug 2018 08:59:19 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 30 Aug 2018 08:59:19 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jolsa@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 29, 2018 at 10:18:30AM -0700, Andi Kleen wrote: > From: Andi Kleen > > The branch target output relies on the user_set flag to determine > if the branch target should be implicitely printed. When > modifying the fields with + or - also set user_set, > so that ADDR can be removed. We also need to set wildcard_set > to make the initial sanity check pass. > please provide examples to changelog, also this one breaks the compilation thanks, jirka > Signed-off-by: Andi Kleen > --- > tools/perf/builtin-script.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c > index 6a470dd8f2d0..14b19ff43cbd 100644 > --- a/tools/perf/builtin-script.c > +++ b/tools/perf/builtin-script.c > @@ -2497,6 +2497,8 @@ static int parse_output_fields(const struct option *opt __maybe_unused, > output[j].fields &= ~all_output_options[i].field; > else > output[j].fields |= all_output_options[i].field; > + output[j].user_set = true; > + output[j].wildcard_set = true; > } > } > } else { > @@ -2507,7 +2509,8 @@ static int parse_output_fields(const struct option *opt __maybe_unused, > rc = -EINVAL; > goto out; > } > - output[type].fields |= all_output_options[i].field; > + output[j].user_set = true; > + output[j].wildcard_set = true; > } > } > > -- > 2.17.1 >