From: Ian Rogers <irogers@google.com>
To: "Peter Zijlstra" <peterz@infradead.org>,
"Ingo Molnar" <mingo@redhat.com>,
"Arnaldo Carvalho de Melo" <acme@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
"Jiri Olsa" <jolsa@kernel.org>,
"Namhyung Kim" <namhyung@kernel.org>,
"Ian Rogers" <irogers@google.com>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"John Garry" <john.g.garry@oracle.com>,
"Will Deacon" <will@kernel.org>,
"James Clark" <james.clark@arm.com>,
"Mike Leach" <mike.leach@linaro.org>,
"Leo Yan" <leo.yan@linaro.org>,
"Mathieu Poirier" <mathieu.poirier@linaro.org>,
"Suzuki K Poulose" <suzuki.poulose@arm.com>,
"Kan Liang" <kan.liang@linux.intel.com>,
"Raul Silvera" <rsilvera@google.com>,
"Athira Rajeev" <atrajeev@linux.vnet.ibm.com>,
"Ravi Bangoria" <ravi.bangoria@amd.com>,
"Florian Fischer" <florian.fischer@muhq.space>,
"Rob Herring" <robh@kernel.org>,
"Xing Zhengjun" <zhengjun.xing@linux.intel.com>,
"Sean Christopherson" <seanjc@google.com>,
"Chengdong Li" <chengdongli@tencent.com>,
"Denis Nikitin" <denik@chromium.org>,
"Martin Liška" <mliska@suse.cz>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org
Subject: [PATCH v1 4/6] perf version: Use regular verbose flag
Date: Mon, 27 Mar 2023 18:40:56 -0700 [thread overview]
Message-ID: <20230328014058.870413-5-irogers@google.com> (raw)
In-Reply-To: <20230328014058.870413-1-irogers@google.com>
Remove additional version_verbose flag by using the existing verbose
variable.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/builtin-version.c | 5 ++---
tools/perf/perf.c | 2 +-
tools/perf/perf.h | 1 -
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/tools/perf/builtin-version.c b/tools/perf/builtin-version.c
index 4a43043ca8ef..1872c90a6667 100644
--- a/tools/perf/builtin-version.c
+++ b/tools/perf/builtin-version.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "builtin.h"
#include "color.h"
+#include "util/debug.h"
#include "util/header.h"
#include <tools/config.h>
#include <stdbool.h>
@@ -8,8 +9,6 @@
#include <string.h>
#include <subcmd/parse-options.h>
-int version_verbose;
-
struct version {
bool build_options;
};
@@ -92,7 +91,7 @@ int cmd_version(int argc, const char **argv)
printf("perf version %s\n", perf_version_string);
- if (version.build_options || version_verbose == 1)
+ if (version.build_options || verbose > 0)
library_status();
return 0;
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 997bb9ea5ebc..441c354b8304 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -212,7 +212,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
if (!strcmp(cmd, "-vv")) {
(*argv)[0] = "version";
- version_verbose = 1;
+ verbose = 1;
break;
}
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 20e9b93f8a39..989eb17ec474 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -18,5 +18,4 @@ enum perf_affinity {
PERF_AFFINITY_MAX
};
-extern int version_verbose;
#endif
--
2.40.0.348.gf938b09366-goog
next prev parent reply other threads:[~2023-03-28 1:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-28 1:40 [PATCH v1 0/6] Simplify linking against tools/perf code Ian Rogers
2023-03-28 1:40 ` [PATCH v1 1/6] perf ui: Move window resize signal functions Ian Rogers
2023-03-28 1:40 ` [PATCH v1 2/6] perf usage: Move usage strings Ian Rogers
2023-03-28 1:40 ` [PATCH v1 3/6] perf header: Move perf_version_string declaration Ian Rogers
2023-03-28 1:40 ` Ian Rogers [this message]
2023-03-28 1:40 ` [PATCH v1 5/6] perf util: Move input_name to util Ian Rogers
2023-03-28 1:40 ` [PATCH v1 6/6] perf util: Move perf_guest/host declarations Ian Rogers
2023-03-28 13:24 ` [PATCH v1 0/6] Simplify linking against tools/perf code Adrian Hunter
2023-03-28 16:14 ` Ian Rogers
2023-03-28 17:11 ` Adrian Hunter
2023-03-28 17:42 ` Ian Rogers
2023-03-30 5:39 ` Adrian Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230328014058.870413-5-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=chengdongli@tencent.com \
--cc=coresight@lists.linaro.org \
--cc=denik@chromium.org \
--cc=florian.fischer@muhq.space \
--cc=james.clark@arm.com \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=mingo@redhat.com \
--cc=mliska@suse.cz \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=robh@kernel.org \
--cc=rsilvera@google.com \
--cc=seanjc@google.com \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
--cc=zhengjun.xing@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).