From: Peter Zijlstra <peterz@infradead.org>
To: bp@alien8.de, jpoimboe@redhat.com, mbenes@suze.cz
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, x86@kernel.org
Subject: [PATCH 2/3] objtool: Collate parse_options() users
Date: Fri, 26 Feb 2021 11:57:44 +0100 [thread overview]
Message-ID: <20210226110004.193108106@infradead.org> (raw)
In-Reply-To: 20210226105742.844988140@infradead.org
Ensure there's a single place that parses check_options, in
preparation for extending where to get options from.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
tools/objtool/builtin-check.c | 14 +++++++++-----
tools/objtool/builtin-orc.c | 5 +----
tools/objtool/include/objtool/builtin.h | 2 ++
3 files changed, 12 insertions(+), 9 deletions(-)
--- a/tools/objtool/builtin-check.c
+++ b/tools/objtool/builtin-check.c
@@ -40,17 +40,21 @@ const struct option check_options[] = {
OPT_END(),
};
+int cmd_parse_options(int argc, const char **argv, const char * const usage[])
+{
+ argc = parse_options(argc, argv, check_options, usage, 0);
+ if (argc != 1)
+ usage_with_options(usage, check_options);
+ return argc;
+}
+
int cmd_check(int argc, const char **argv)
{
const char *objname, *s;
struct objtool_file *file;
int ret;
- argc = parse_options(argc, argv, check_options, check_usage, 0);
-
- if (argc != 1)
- usage_with_options(check_usage, check_options);
-
+ argc = cmd_parse_options(argc, argv, check_usage);
objname = argv[0];
s = strstr(objname, "vmlinux.o");
--- a/tools/objtool/builtin-orc.c
+++ b/tools/objtool/builtin-orc.c
@@ -34,10 +34,7 @@ int cmd_orc(int argc, const char **argv)
struct objtool_file *file;
int ret;
- argc = parse_options(argc, argv, check_options, orc_usage, 0);
- if (argc != 1)
- usage_with_options(orc_usage, check_options);
-
+ argc = cmd_parse_options(argc, argv, orc_usage);
objname = argv[0];
file = objtool_open_read(objname);
--- a/tools/objtool/include/objtool/builtin.h
+++ b/tools/objtool/include/objtool/builtin.h
@@ -11,6 +11,8 @@ extern const struct option check_options
extern bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats;
extern bool validate_dup, vmlinux, backup;
+extern int cmd_parse_options(int argc, const char **argv, const char * const usage[]);
+
extern int cmd_check(int argc, const char **argv);
extern int cmd_orc(int argc, const char **argv);
next prev parent reply other threads:[~2021-02-26 11:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 10:57 [PATCH 0/3] objtool: OBJTOOL_ARGS and --backup Peter Zijlstra
2021-02-26 10:57 ` [PATCH 1/3] objtool: Add --backup Peter Zijlstra
2021-02-26 11:48 ` Borislav Petkov
2021-03-02 11:58 ` Peter Zijlstra
2021-03-03 8:45 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-03-06 11:48 ` tip-bot2 for Peter Zijlstra
2021-02-26 10:57 ` Peter Zijlstra [this message]
2021-03-03 8:45 ` [tip: objtool/core] objtool: Collate parse_options() users tip-bot2 for Peter Zijlstra
2021-03-06 11:48 ` tip-bot2 for Peter Zijlstra
2021-02-26 10:57 ` [PATCH 3/3] objtool: Parse options from OBJTOOL_ARGS Peter Zijlstra
2021-03-03 8:45 ` [tip: objtool/core] " tip-bot2 for Peter Zijlstra
2021-03-04 14:12 ` Peter Zijlstra
2021-03-06 11:48 ` tip-bot2 for Peter Zijlstra
2021-02-26 12:27 ` [PATCH 0/3] objtool: OBJTOOL_ARGS and --backup Peter Zijlstra
2021-03-03 0:29 ` Josh Poimboeuf
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=20210226110004.193108106@infradead.org \
--to=peterz@infradead.org \
--cc=bp@alien8.de \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbenes@suze.cz \
--cc=x86@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.