qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Subject: [PULL 11/53] qemu-option: Factor out helper opt_create()
Date: Tue,  7 Jul 2020 23:24:21 +0200	[thread overview]
Message-ID: <20200707212503.1495927-12-armbru@redhat.com> (raw)
In-Reply-To: <20200707212503.1495927-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>
Message-Id: <20200707160613.848843-12-armbru@redhat.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



  parent reply	other threads:[~2020-07-08 21:45 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-07 21:24 [PULL 00/53] Error reporting patches patches for 2020-07-07 Markus Armbruster
2020-07-07 21:24 ` [PULL 01/53] error: Fix examples in error.h's big comment Markus Armbruster
2020-07-07 21:24 ` [PULL 02/53] error: Improve " Markus Armbruster
2020-07-07 21:24 ` [PULL 03/53] error: Document Error API usage rules Markus Armbruster
2020-07-07 21:24 ` [PULL 04/53] qdev: Use returned bool to check for qdev_realize() etc. failure Markus Armbruster
2020-07-07 21:24 ` [PULL 05/53] macio: Tidy up error handling in macio_newworld_realize() Markus Armbruster
2020-07-07 21:24 ` [PULL 06/53] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize() Markus Armbruster
2020-07-07 21:24 ` [PULL 07/53] qemu-option: Check return value instead of @err where convenient Markus Armbruster
2020-07-07 21:24 ` [PULL 08/53] qemu-option: Make uses of find_desc_by_name() more similar Markus Armbruster
2020-07-07 21:24 ` [PULL 09/53] qemu-option: Factor out helper find_default_by_name() Markus Armbruster
2020-07-07 21:24 ` [PULL 10/53] qemu-option: Simplify around find_default_by_name() Markus Armbruster
2020-07-07 21:24 ` Markus Armbruster [this message]
2020-07-07 21:24 ` [PULL 12/53] qemu-option: Replace opt_set() by cleaner opt_validate() Markus Armbruster
2020-07-07 21:24 ` [PULL 13/53] qemu-option: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-07 21:24 ` [PULL 14/53] qemu-option: Use returned bool to check for failure Markus Armbruster
2020-07-07 21:24 ` [PULL 15/53] block: Avoid error accumulation in bdrv_img_create() Markus Armbruster
2020-07-07 21:24 ` [PULL 16/53] hmp: Eliminate a variable in hmp_migrate_set_parameter() Markus Armbruster
2020-07-07 21:24 ` [PULL 17/53] qapi: Make visitor functions taking Error ** return bool, not void Markus Armbruster
2020-07-07 21:24 ` [PULL 18/53] qapi: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-07 21:24 ` [PULL 19/53] qapi: Use returned bool to check for failure, manual part Markus Armbruster
2020-07-07 21:24 ` [PULL 20/53] s390x/pci: Fix harmless mistake in zpci's property fid's setter Markus Armbruster
2020-07-07 21:24 ` [PULL 21/53] qom: Use error_reportf_err() instead of g_printerr() in examples Markus Armbruster
2020-07-07 21:24 ` [PULL 22/53] qom: Rename qdev_get_type() to object_get_type() Markus Armbruster
2020-07-07 21:24 ` [PULL 23/53] qom: Crash more nicely on object_property_get_link() failure Markus Armbruster
2020-07-07 21:24 ` [PULL 24/53] qom: Don't handle impossible " Markus Armbruster
2020-07-07 21:24 ` [PULL 25/53] qom: Use return values to check for error where that's simpler Markus Armbruster
2020-07-07 21:24 ` [PULL 26/53] qom: Put name parameter before value / visitor parameter Markus Armbruster
2020-07-07 21:24 ` [PULL 27/53] qom: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-07 21:24 ` [PULL 28/53] qom: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-07 21:24 ` [PULL 29/53] qom: Use returned bool to check for failure, manual part Markus Armbruster
2020-07-07 21:24 ` [PULL 30/53] qom: Make functions taking Error ** return bool, not 0/-1 Markus Armbruster
2020-07-07 21:24 ` [PULL 31/53] qdev: Make functions taking Error ** return bool, not void Markus Armbruster
2020-07-07 21:24 ` [PULL 32/53] qdev: Use returned bool to check for failure, Coccinelle part Markus Armbruster
2020-07-07 21:24 ` [PULL 33/53] error: Avoid unnecessary error_propagate() after error_setg() Markus Armbruster
2020-07-07 21:24 ` [PULL 34/53] error: Eliminate error_propagate() with Coccinelle, part 1 Markus Armbruster
2020-07-07 21:24 ` [PULL 35/53] error: Eliminate error_propagate() with Coccinelle, part 2 Markus Armbruster
2020-07-07 21:24 ` [PULL 36/53] error: Eliminate error_propagate() manually Markus Armbruster
2020-07-07 21:24 ` [PULL 37/53] error: Reduce unnecessary error propagation Markus Armbruster
2020-07-07 21:24 ` [PULL 38/53] block/parallels: Simplify parallels_open() after previous commit Markus Armbruster
2020-07-07 21:24 ` [PULL 39/53] qapi: Smooth another visitor error checking pattern Markus Armbruster
2020-07-07 21:24 ` [PULL 40/53] qapi: Smooth visitor error checking in generated code Markus Armbruster
2020-07-07 21:24 ` [PULL 41/53] qapi: Purge error_propagate() from QAPI core Markus Armbruster
2020-07-07 21:24 ` [PULL 42/53] error: Avoid error_propagate() after migrate_add_blocker() Markus Armbruster
2020-07-07 21:24 ` [PULL 43/53] qemu-img: Ignore Error objects where the return value suffices Markus Armbruster
2020-07-07 21:24 ` [PULL 44/53] qdev: " Markus Armbruster
2020-07-07 21:24 ` [PULL 45/53] hmp: " Markus Armbruster
2020-07-07 21:24 ` [PULL 46/53] error: New macro ERRP_GUARD() Markus Armbruster
2020-07-07 21:24 ` [PULL 47/53] scripts: Coccinelle script to use ERRP_GUARD() Markus Armbruster
2021-03-11 19:21   ` Philippe Mathieu-Daudé
2021-03-12  8:36     ` Markus Armbruster
2021-03-12 10:17       ` Philippe Mathieu-Daudé
2020-07-07 21:24 ` [PULL 48/53] sd: Use ERRP_GUARD() Markus Armbruster
2020-07-07 21:24 ` [PULL 49/53] pflash: " Markus Armbruster
2020-07-07 21:25 ` [PULL 50/53] fw_cfg: " Markus Armbruster
2020-07-07 21:25 ` [PULL 51/53] virtio-9p: " Markus Armbruster
2020-07-07 21:25 ` [PULL 52/53] nbd: " Markus Armbruster
2020-07-07 21:25 ` [PULL 53/53] xen: " Markus Armbruster
2020-07-10 12:47 ` [PULL 00/53] Error reporting patches patches for 2020-07-07 Markus Armbruster

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=20200707212503.1495927-12-armbru@redhat.com \
    --to=armbru@redhat.com \
    --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).