From: Greg Kurz <groug@kaod.org>
To: Markus Armbruster <armbru@redhat.com>
Cc: peter.maydell@linaro.org, vsementsov@virtuozzo.com,
berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org,
qemu-devel@nongnu.org, pbonzini@redhat.com
Subject: Re: [PATCH v3 08/44] qemu-option: Factor out helper find_default_by_name()
Date: Tue, 7 Jul 2020 10:47:14 +0200 [thread overview]
Message-ID: <20200707104714.7c34f24b@bahia.lan> (raw)
In-Reply-To: <20200706080950.403087-9-armbru@redhat.com>
On Mon, 6 Jul 2020 10:09:14 +0200
Markus Armbruster <armbru@redhat.com> wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
> util/qemu-option.c | 47 ++++++++++++++++++++++++++--------------------
> 1 file changed, 27 insertions(+), 20 deletions(-)
>
> diff --git a/util/qemu-option.c b/util/qemu-option.c
> index 1df55bc881..14e211ddd8 100644
> --- a/util/qemu-option.c
> +++ b/util/qemu-option.c
> @@ -142,6 +142,13 @@ static const QemuOptDesc *find_desc_by_name(const QemuOptDesc *desc,
> return NULL;
> }
>
> +static const char *find_default_by_name(QemuOpts *opts, const char *name)
> +{
> + const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name);
> +
> + return desc ? desc->def_value_str : NULL;
> +}
> +
> void parse_option_size(const char *name, const char *value,
> uint64_t *ret, Error **errp)
> {
> @@ -270,7 +277,7 @@ static void qemu_opt_del_all(QemuOpts *opts, const char *name)
> const char *qemu_opt_get(QemuOpts *opts, const char *name)
> {
> QemuOpt *opt;
> - const QemuOptDesc *desc;
> + const char *def_val;
>
> if (opts == NULL) {
> return NULL;
> @@ -278,9 +285,9 @@ const char *qemu_opt_get(QemuOpts *opts, const char *name)
>
> opt = qemu_opt_find(opts, name);
> if (!opt) {
> - desc = find_desc_by_name(opts->list->desc, name);
> - if (desc && desc->def_value_str) {
> - return desc->def_value_str;
> + def_val = find_default_by_name(opts, name);
> + if (def_val) {
> + return def_val;
> }
> }
> return opt ? opt->str : NULL;
> @@ -312,7 +319,7 @@ const char *qemu_opt_iter_next(QemuOptsIter *iter)
> char *qemu_opt_get_del(QemuOpts *opts, const char *name)
> {
> QemuOpt *opt;
> - const QemuOptDesc *desc;
> + const char *def_val;
> char *str = NULL;
>
> if (opts == NULL) {
> @@ -321,9 +328,9 @@ char *qemu_opt_get_del(QemuOpts *opts, const char *name)
>
> opt = qemu_opt_find(opts, name);
> if (!opt) {
> - desc = find_desc_by_name(opts->list->desc, name);
> - if (desc && desc->def_value_str) {
> - str = g_strdup(desc->def_value_str);
> + def_val = find_default_by_name(opts, name);
> + if (def_val) {
> + str = g_strdup(def_val);
> }
> return str;
> }
This could be possibly abbreviated to:
if (!opt) {
return g_strdup(find_default_by_name(opts, name));
}
since g_strdup(NULL) returns NULL, but the more verbose version
is nice as well and it is consistent with the other changes, so:
Reviewed-by: Greg Kurz <groug@kaod.org>
> @@ -349,7 +356,7 @@ static bool qemu_opt_get_bool_helper(QemuOpts *opts, const char *name,
> bool defval, bool del)
> {
> QemuOpt *opt;
> - const QemuOptDesc *desc;
> + const char *def_val;
> bool ret = defval;
>
> if (opts == NULL) {
> @@ -358,9 +365,9 @@ static bool qemu_opt_get_bool_helper(QemuOpts *opts, const char *name,
>
> opt = qemu_opt_find(opts, name);
> if (opt == NULL) {
> - desc = find_desc_by_name(opts->list->desc, name);
> - if (desc && desc->def_value_str) {
> - parse_option_bool(name, desc->def_value_str, &ret, &error_abort);
> + def_val = find_default_by_name(opts, name);
> + if (def_val) {
> + parse_option_bool(name, def_val, &ret, &error_abort);
> }
> return ret;
> }
> @@ -386,7 +393,7 @@ static uint64_t qemu_opt_get_number_helper(QemuOpts *opts, const char *name,
> uint64_t defval, bool del)
> {
> QemuOpt *opt;
> - const QemuOptDesc *desc;
> + const char *def_val;
> uint64_t ret = defval;
>
> if (opts == NULL) {
> @@ -395,9 +402,9 @@ static uint64_t qemu_opt_get_number_helper(QemuOpts *opts, const char *name,
>
> opt = qemu_opt_find(opts, name);
> if (opt == NULL) {
> - desc = find_desc_by_name(opts->list->desc, name);
> - if (desc && desc->def_value_str) {
> - parse_option_number(name, desc->def_value_str, &ret, &error_abort);
> + def_val = find_default_by_name(opts, name);
> + if (def_val) {
> + parse_option_number(name, def_val, &ret, &error_abort);
> }
> return ret;
> }
> @@ -424,7 +431,7 @@ static uint64_t qemu_opt_get_size_helper(QemuOpts *opts, const char *name,
> uint64_t defval, bool del)
> {
> QemuOpt *opt;
> - const QemuOptDesc *desc;
> + const char *def_val;
> uint64_t ret = defval;
>
> if (opts == NULL) {
> @@ -433,9 +440,9 @@ static uint64_t qemu_opt_get_size_helper(QemuOpts *opts, const char *name,
>
> opt = qemu_opt_find(opts, name);
> if (opt == NULL) {
> - desc = find_desc_by_name(opts->list->desc, name);
> - if (desc && desc->def_value_str) {
> - parse_option_size(name, desc->def_value_str, &ret, &error_abort);
> + def_val = find_default_by_name(opts, name);
> + if (def_val) {
> + parse_option_size(name, def_val, &ret, &error_abort);
> }
> return ret;
> }
next prev parent reply other threads:[~2020-07-07 8:48 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 8:09 [PATCH v3 00/44] Less clumsy error checking Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 01/44] error: Improve examples in error.h's big comment Markus Armbruster
2020-07-06 14:33 ` Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 02/44] error: Document Error API usage rules Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 03/44] qdev: Use returned bool to check for qdev_realize() etc. failure Markus Armbruster
2020-07-06 10:08 ` Greg Kurz
2020-07-06 11:35 ` Markus Armbruster
2020-07-06 14:43 ` Greg Kurz
2020-07-06 8:09 ` [PATCH v3 04/44] macio: Tidy up error handling in macio_newworld_realize() Markus Armbruster
2020-07-06 14:47 ` Greg Kurz
2020-07-06 8:09 ` [PATCH v3 05/44] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize() Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 06/44] qemu-option: Check return value instead of @err where convenient Markus Armbruster
2020-07-06 15:59 ` Greg Kurz
2020-07-06 20:01 ` Markus Armbruster
2020-07-07 8:25 ` Greg Kurz
2020-07-06 8:09 ` [PATCH v3 07/44] qemu-option: Make uses of find_desc_by_name() more similar Markus Armbruster
2020-07-07 8:26 ` Greg Kurz
2020-07-06 8:09 ` [PATCH v3 08/44] qemu-option: Factor out helper find_default_by_name() Markus Armbruster
2020-07-07 8:47 ` Greg Kurz [this message]
2020-07-06 8:09 ` [PATCH v3 09/44] qemu-option: Simplify around find_default_by_name() Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 10/44] qemu-option: Factor out helper opt_create() Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 11/44] qemu-option: Replace opt_set() by cleaner opt_validate() Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 12/44] qemu-option: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 13/44] qemu-option: Use returned bool to check for failure Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 14/44] block: Avoid error accumulation in bdrv_img_create() Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 15/44] hmp: Eliminate a variable in hmp_migrate_set_parameter() Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 16/44] qapi: Make visitor functions taking Error ** return bool, not void Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 17/44] qapi: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 18/44] qapi: Use returned bool to check for failure, manual part Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 19/44] s390x/pci: Fix harmless mistake in zpci's property fid's setter Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 20/44] qom: Use error_reportf_err() instead of g_printerr() in examples Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 21/44] qom: Rename qdev_get_type() to object_get_type() Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 22/44] qom: Crash more nicely on object_property_get_link() failure Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 23/44] qom: Don't handle impossible " Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 24/44] qom: Use return values to check for error where that's simpler Markus Armbruster
2020-07-06 11:23 ` Vladimir Sementsov-Ogievskiy
2020-07-06 8:09 ` [PATCH v3 25/44] qom: Put name parameter before value / visitor parameter Markus Armbruster
2020-07-06 15:19 ` Vladimir Sementsov-Ogievskiy
2020-07-06 8:09 ` [PATCH v3 26/44] qom: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-06 15:44 ` Vladimir Sementsov-Ogievskiy
2020-07-06 8:09 ` [PATCH v3 27/44] qom: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-06 16:08 ` Vladimir Sementsov-Ogievskiy
2020-07-06 8:09 ` [PATCH v3 28/44] qom: Use returned bool to check for failure, manual part Markus Armbruster
2020-07-06 16:39 ` Vladimir Sementsov-Ogievskiy
2020-07-06 8:09 ` [PATCH v3 29/44] qom: Make functions taking Error ** return bool, not 0/-1 Markus Armbruster
2020-07-06 16:52 ` Vladimir Sementsov-Ogievskiy
2020-07-06 20:07 ` Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 30/44] qdev: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-06 16:58 ` Vladimir Sementsov-Ogievskiy
2020-07-06 8:09 ` [PATCH v3 31/44] qdev: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 32/44] error: Avoid unnecessary error_propagate() after error_setg() Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 33/44] error: Eliminate error_propagate() with Coccinelle, part 1 Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 34/44] error: Eliminate error_propagate() with Coccinelle, part 2 Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 35/44] error: Eliminate error_propagate() manually Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 36/44] error: Reduce unnecessary error propagation Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 37/44] block/parallels: Simplify parallels_open() after previous commit Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 38/44] qapi: Smooth another visitor error checking pattern Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 39/44] qapi: Smooth visitor error checking in generated code Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 40/44] qapi: Purge error_propagate() from QAPI core Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 41/44] error: Avoid error_propagate() after migrate_add_blocker() Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 42/44] qemu-img: Ignore Error objects where the return value suffices Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 43/44] qdev: " Markus Armbruster
2020-07-06 8:09 ` [PATCH v3 44/44] hmp: " Markus Armbruster
2020-07-06 8:12 ` [PATCH v3 00/44] Less clumsy error checking Markus Armbruster
2020-07-06 13:44 ` Eric Blake
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=20200707104714.7c34f24b@bahia.lan \
--to=groug@kaod.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.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).