[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/32] qemu-option: Avoid has_help_option() in qemu_opts_parse_noi
From: |
Markus Armbruster |
Subject: |
[PULL 07/32] qemu-option: Avoid has_help_option() in qemu_opts_parse_noisily() |
Date: |
Wed, 29 Apr 2020 09:20:23 +0200 |
When opts_parse() sets @invalidp to true, qemu_opts_parse_noisily()
uses has_help_option() to decide whether to print help. This parses
the input string a second time.
Easy to avoid: replace @invalidp by @help_wanted.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
util/qemu-option.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 0abf26b61f..2d0d24ee27 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -519,7 +519,7 @@ int qemu_opt_unset(QemuOpts *opts, const char *name)
}
static void opt_set(QemuOpts *opts, const char *name, char *value,
- bool prepend, bool *invalidp, Error **errp)
+ bool prepend, bool *help_wanted, Error **errp)
{
QemuOpt *opt;
const QemuOptDesc *desc;
@@ -529,8 +529,8 @@ static void opt_set(QemuOpts *opts, const char *name, char
*value,
if (!desc && !opts_accepts_any(opts)) {
g_free(value);
error_setg(errp, QERR_INVALID_PARAMETER, name);
- if (invalidp) {
- *invalidp = true;
+ if (help_wanted && is_help_option(name)) {
+ *help_wanted = true;
}
return;
}
@@ -827,7 +827,7 @@ static const char *get_opt_name_value(const char *params,
static void opts_do_parse(QemuOpts *opts, const char *params,
const char *firstname, bool prepend,
- bool *invalidp, Error **errp)
+ bool *help_wanted, Error **errp)
{
Error *local_err = NULL;
char *option, *value;
@@ -843,7 +843,7 @@ static void opts_do_parse(QemuOpts *opts, const char
*params,
continue;
}
- opt_set(opts, option, value, prepend, invalidp, &local_err);
+ opt_set(opts, option, value, prepend, help_wanted, &local_err);
g_free(option);
if (local_err) {
error_propagate(errp, local_err);
@@ -903,7 +903,7 @@ void qemu_opts_do_parse(QemuOpts *opts, const char *params,
static QemuOpts *opts_parse(QemuOptsList *list, const char *params,
bool permit_abbrev, bool defaults,
- bool *invalidp, Error **errp)
+ bool *help_wanted, Error **errp)
{
const char *firstname;
char *id = opts_parse_id(params);
@@ -928,7 +928,7 @@ static QemuOpts *opts_parse(QemuOptsList *list, const char
*params,
return NULL;
}
- opts_do_parse(opts, params, firstname, defaults, invalidp, &local_err);
+ opts_do_parse(opts, params, firstname, defaults, help_wanted, &local_err);
if (local_err) {
error_propagate(errp, local_err);
qemu_opts_del(opts);
@@ -964,11 +964,11 @@ QemuOpts *qemu_opts_parse_noisily(QemuOptsList *list,
const char *params,
{
Error *err = NULL;
QemuOpts *opts;
- bool invalidp = false;
+ bool help_wanted = false;
- opts = opts_parse(list, params, permit_abbrev, false, &invalidp, &err);
+ opts = opts_parse(list, params, permit_abbrev, false, &help_wanted, &err);
if (err) {
- if (invalidp && has_help_option(params)) {
+ if (help_wanted) {
qemu_opts_print_help(list, true);
error_free(err);
} else {
--
2.21.1
- [PULL 00/32] Miscellaneous patches for 2020-04-29, Markus Armbruster, 2020/04/29
- [PULL 10/32] qemu-img: Reject broken -o "", Markus Armbruster, 2020/04/29
- [PULL 02/32] tests-qemu-opts: Cover has_help_option(), qemu_opt_has_help_opt(), Markus Armbruster, 2020/04/29
- [PULL 05/32] qemu-option: Fix has_help_option()'s sloppy parsing, Markus Armbruster, 2020/04/29
- [PULL 09/32] qemu-img: Move is_valid_option_list() to qemu-img.c and rewrite, Markus Armbruster, 2020/04/29
- [PULL 03/32] qemu-options: Factor out get_opt_name_value() helper, Markus Armbruster, 2020/04/29
- [PULL 04/32] qemu-option: Fix sloppy recognition of "id=..." after ", , ", Markus Armbruster, 2020/04/29
- [PULL 06/32] test-qemu-opts: Simplify test_has_help_option() after bug fix, Markus Armbruster, 2020/04/29
- [PULL 20/32] io: Fix qio_channel_socket_close() error handling, Markus Armbruster, 2020/04/29
- [PULL 31/32] libqos: Give get_machine_allocator() internal linkage, Markus Armbruster, 2020/04/29
- [PULL 07/32] qemu-option: Avoid has_help_option() in qemu_opts_parse_noisily(),
Markus Armbruster <=
- [PULL 19/32] xen/pt: Fix flawed conversion to realize(), Markus Armbruster, 2020/04/29
- [PULL 32/32] qemu-option: pass NULL rather than 0 to the id of qemu_opts_set(), Markus Armbruster, 2020/04/29
- [PULL 08/32] qemu-img: Factor out accumulate_options() helper, Markus Armbruster, 2020/04/29
- [PULL 24/32] qga: Fix qmp_guest_suspend_{disk, ram}() error handling, Markus Armbruster, 2020/04/29
- [PULL 25/32] sam460ex: Suppress useless warning on -m 32 and -m 64, Markus Armbruster, 2020/04/29
- [PULL 27/32] bamboo, sam460ex: Tidy up error message for unsupported RAM size, Markus Armbruster, 2020/04/29
- [PULL 16/32] fdc: Fix fallback=auto error handling, Markus Armbruster, 2020/04/29
- [PULL 28/32] smbus: Fix spd_data_generate() for number of banks > 2, Markus Armbruster, 2020/04/29
- [PULL 11/32] cryptodev: Fix cryptodev_builtin_cleanup() error API violation, Markus Armbruster, 2020/04/29
- [PULL 01/32] various: Remove suspicious '\' character outside of #define in C code, Markus Armbruster, 2020/04/29