From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, vsementsov@virtuozzo.com,
berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org,
pbonzini@redhat.com
Subject: [PATCH v2 10/44] qemu-option: Factor out helper opt_create()
Date: Thu, 2 Jul 2020 17:49:26 +0200 [thread overview]
Message-ID: <20200702155000.3455325-11-armbru@redhat.com> (raw)
In-Reply-To: <20200702155000.3455325-1-armbru@redhat.com>
There is just one use so far. The next commit will add more.
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 | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/util/qemu-option.c b/util/qemu-option.c
index e7b540a21b..1023fe7527 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -499,6 +499,23 @@ int qemu_opt_unset(QemuOpts *opts, const char *name)
}
}
+static QemuOpt *opt_create(QemuOpts *opts, const char *name, char *value,
+ bool prepend)
+{
+ QemuOpt *opt = g_malloc0(sizeof(*opt));
+
+ opt->name = g_strdup(name);
+ opt->str = value;
+ opt->opts = opts;
+ if (prepend) {
+ QTAILQ_INSERT_HEAD(&opts->head, opt, next);
+ } else {
+ QTAILQ_INSERT_TAIL(&opts->head, opt, next);
+ }
+
+ return opt;
+}
+
static void opt_set(QemuOpts *opts, const char *name, char *value,
bool prepend, bool *help_wanted, Error **errp)
{
@@ -516,16 +533,8 @@ static void opt_set(QemuOpts *opts, const char *name, char *value,
return;
}
- opt = g_malloc0(sizeof(*opt));
- opt->name = g_strdup(name);
- opt->opts = opts;
- if (prepend) {
- QTAILQ_INSERT_HEAD(&opts->head, opt, next);
- } else {
- QTAILQ_INSERT_TAIL(&opts->head, opt, next);
- }
+ opt = opt_create(opts, name, value, prepend);
opt->desc = desc;
- opt->str = value;
qemu_opt_parse(opt, &local_err);
if (local_err) {
error_propagate(errp, local_err);
--
2.26.2
next prev parent reply other threads:[~2020-07-02 16:09 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-02 15:49 [PATCH v2 00/44] Less clumsy error checking Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 01/44] error: Improve examples in error.h's big comment Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 02/44] error: Document Error API usage rules Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 03/44] qdev: Use returned bool to check for qdev_realize() etc. failure Markus Armbruster
2020-07-02 16:23 ` Eric Blake
2020-07-02 18:57 ` Vladimir Sementsov-Ogievskiy
2020-07-02 15:49 ` [PATCH v2 04/44] macio: Tidy up error handling in macio_newworld_realize() Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 05/44] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize() Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 06/44] qemu-option: Check return value instead of @err where convenient Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 07/44] qemu-option: Make uses of find_desc_by_name() more similar Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 08/44] qemu-option: Factor out helper find_default_by_name() Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 09/44] qemu-option: Simplify around find_default_by_name() Markus Armbruster
2020-07-02 15:49 ` Markus Armbruster [this message]
2020-07-02 15:49 ` [PATCH v2 11/44] qemu-option: Replace opt_set() by cleaner opt_validate() Markus Armbruster
2020-07-02 19:49 ` Vladimir Sementsov-Ogievskiy
2020-07-02 15:49 ` [PATCH v2 12/44] qemu-option: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 13/44] qemu-option: Use returned bool to check for failure Markus Armbruster
2020-07-02 16:25 ` Eric Blake
2020-07-03 12:15 ` Vladimir Sementsov-Ogievskiy
2020-07-02 15:49 ` [PATCH v2 14/44] block: Avoid error accumulation in bdrv_img_create() Markus Armbruster
2020-07-02 16:26 ` Eric Blake
2020-07-03 6:46 ` Markus Armbruster
2020-07-03 12:24 ` Vladimir Sementsov-Ogievskiy
2020-07-02 15:49 ` [PATCH v2 15/44] hmp: Eliminate a variable in hmp_migrate_set_parameter() Markus Armbruster
2020-07-03 12:29 ` Vladimir Sementsov-Ogievskiy
2020-07-02 15:49 ` [PATCH v2 16/44] qapi: Make visitor functions taking Error ** return bool, not void Markus Armbruster
2020-07-02 16:35 ` Eric Blake
2020-07-03 14:32 ` Vladimir Sementsov-Ogievskiy
2020-07-04 13:19 ` Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 17/44] qapi: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-02 17:28 ` Eric Blake
2020-07-03 14:56 ` Vladimir Sementsov-Ogievskiy
2020-07-02 15:49 ` [PATCH v2 18/44] qapi: Use returned bool to check for failure, manual part Markus Armbruster
2020-07-03 15:10 ` Vladimir Sementsov-Ogievskiy
2020-07-02 15:49 ` [PATCH v2 19/44] block/parallels: Simplify parallels_open() after previous commit Markus Armbruster
2020-07-03 15:29 ` Vladimir Sementsov-Ogievskiy
2020-07-04 13:28 ` Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 20/44] s390x/pci: Fix harmless mistake in zpci's property fid's setter Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 21/44] qom: Use error_reportf_err() instead of g_printerr() in examples Markus Armbruster
2020-07-03 15:33 ` Vladimir Sementsov-Ogievskiy
2020-07-02 15:49 ` [PATCH v2 22/44] qom: Rename qdev_get_type() to object_get_type() Markus Armbruster
2020-07-03 15:35 ` Vladimir Sementsov-Ogievskiy
2020-07-02 15:49 ` [PATCH v2 23/44] qom: Crash more nicely on object_property_get_link() failure Markus Armbruster
2020-07-02 17:29 ` Eric Blake
2020-07-03 15:43 ` Vladimir Sementsov-Ogievskiy
2020-07-04 16:15 ` Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 24/44] qom: Don't handle impossible " Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 25/44] qom: Use return values to check for error where that's simpler Markus Armbruster
2020-07-03 16:06 ` Vladimir Sementsov-Ogievskiy
2020-07-04 14:06 ` Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 26/44] qom: Put name parameter before value / visitor parameter Markus Armbruster
2020-07-03 18:05 ` Vladimir Sementsov-Ogievskiy
2020-07-03 18:06 ` Vladimir Sementsov-Ogievskiy
2020-07-04 16:02 ` Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 27/44] qom: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 28/44] qom: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-02 17:31 ` Eric Blake
2020-07-02 15:49 ` [PATCH v2 29/44] qom: Use returned bool to check for failure, manual part Markus Armbruster
2020-07-02 17:32 ` Eric Blake
2020-07-02 15:49 ` [PATCH v2 30/44] qom: Make functions taking Error ** return bool, not 0/-1 Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 31/44] qdev: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 32/44] qdev: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-02 17:32 ` Eric Blake
2020-07-02 15:49 ` [PATCH v2 33/44] error: Avoid unnecessary error_propagate() after error_setg() Markus Armbruster
2020-07-02 17:43 ` Eric Blake
2020-07-03 6:53 ` Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 34/44] error: Eliminate error_propagate() with Coccinelle, part 1 Markus Armbruster
2020-07-02 18:02 ` Eric Blake
2020-07-03 6:55 ` Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 35/44] error: Eliminate error_propagate() with Coccinelle, part 2 Markus Armbruster
2020-07-02 18:06 ` Eric Blake
2020-07-03 6:59 ` Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 36/44] error: Eliminate error_propagate() manually Markus Armbruster
2020-07-02 18:25 ` Eric Blake
2020-07-03 6:59 ` Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 37/44] error: Reduce unnecessary error propagation Markus Armbruster
2020-07-02 18:27 ` Eric Blake
2020-07-03 7:09 ` Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 38/44] qapi: Smooth another visitor error checking pattern Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 39/44] qapi: Smooth visitor error checking in generated code Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 40/44] qapi: Purge error_propagate() from QAPI core Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 41/44] error: Avoid error_propagate() after migrate_add_blocker() Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 42/44] qemu-img: Ignore Error objects where the return value suffices Markus Armbruster
2020-07-02 15:49 ` [PATCH v2 43/44] qdev: " Markus Armbruster
2020-07-02 15:50 ` [PATCH v2 44/44] hmp: " Markus Armbruster
2020-07-02 15:54 ` [PATCH v2 00/44] Less clumsy error checking Markus Armbruster
2020-07-02 16:56 ` no-reply
2020-07-02 16:58 ` no-reply
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=20200702155000.3455325-11-armbru@redhat.com \
--to=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).