[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/20] qemu-option: Clean up after the previous commit
From: |
Markus Armbruster |
Subject: |
[PULL 05/20] qemu-option: Clean up after the previous commit |
Date: |
Thu, 30 Apr 2020 07:30:49 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
util/qemu-option.c | 43 +++++++++++++++----------------------------
1 file changed, 15 insertions(+), 28 deletions(-)
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 2784757ef5..0ebfd97a98 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -965,18 +965,16 @@ void qemu_opts_set_defaults(QemuOptsList *list, const
char *params,
assert(opts);
}
-typedef struct OptsFromQDictState {
- QemuOpts *opts;
- Error **errp;
-} OptsFromQDictState;
-
-static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *opaque)
+static void qemu_opts_from_qdict_entry(QemuOpts *opts,
+ const QDictEntry *entry,
+ Error **errp)
{
- OptsFromQDictState *state = opaque;
+ const char *key = qdict_entry_key(entry);
+ QObject *obj = qdict_entry_value(entry);
char buf[32], *tmp = NULL;
const char *value;
- if (!strcmp(key, "id") || *state->errp) {
+ if (!strcmp(key, "id")) {
return;
}
@@ -997,7 +995,7 @@ static void qemu_opts_from_qdict_1(const char *key, QObject
*obj, void *opaque)
return;
}
- qemu_opt_set(state->opts, key, value, state->errp);
+ qemu_opt_set(opts, key, value, errp);
g_free(tmp);
}
@@ -1010,7 +1008,6 @@ static void qemu_opts_from_qdict_1(const char *key,
QObject *obj, void *opaque)
QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict,
Error **errp)
{
- OptsFromQDictState state;
Error *local_err = NULL;
QemuOpts *opts;
const QDictEntry *entry;
@@ -1024,20 +1021,15 @@ QemuOpts *qemu_opts_from_qdict(QemuOptsList *list,
const QDict *qdict,
assert(opts != NULL);
- state.errp = &local_err;
- state.opts = opts;
-
for (entry = qdict_first(qdict);
entry;
entry = qdict_next(qdict, entry)) {
- qemu_opts_from_qdict_1(qdict_entry_key(entry),
- qdict_entry_value(entry),
- &state);
- }
- if (local_err) {
- error_propagate(errp, local_err);
- qemu_opts_del(opts);
- return NULL;
+ qemu_opts_from_qdict_entry(opts, entry, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ qemu_opts_del(opts);
+ return NULL;
+ }
}
return opts;
@@ -1056,21 +1048,16 @@ void qemu_opts_absorb_qdict(QemuOpts *opts, QDict
*qdict, Error **errp)
while (entry != NULL) {
Error *local_err = NULL;
- OptsFromQDictState state = {
- .errp = &local_err,
- .opts = opts,
- };
next = qdict_next(qdict, entry);
if (find_desc_by_name(opts->list->desc, entry->key)) {
- qemu_opts_from_qdict_1(entry->key, entry->value, &state);
+ qemu_opts_from_qdict_entry(opts, entry, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
- } else {
- qdict_del(qdict, entry->key);
}
+ qdict_del(qdict, entry->key);
}
entry = next;
--
2.21.1
- [PULL 03/20] qobject: Eliminate qlist_iter(), use QLIST_FOREACH_ENTRY() instead, (continued)
- [PULL 03/20] qobject: Eliminate qlist_iter(), use QLIST_FOREACH_ENTRY() instead, Markus Armbruster, 2020/04/30
- [PULL 02/20] qobject: Factor out helper json_pretty_newline(), Markus Armbruster, 2020/04/30
- [PULL 08/20] qapi: Fix typo in visit_start_list()'s contract, Markus Armbruster, 2020/04/30
- [PULL 09/20] qapi: Document @errp usage more thoroughly in visitor.h, Markus Armbruster, 2020/04/30
- [PULL 12/20] qapi: Fix Visitor contract for start_alternate(), Markus Armbruster, 2020/04/30
- [PULL 11/20] qapi: Assert incomplete object occurs only in dealloc visitor, Markus Armbruster, 2020/04/30
- [PULL 10/20] qapi: Polish prose in visitor.h, Markus Armbruster, 2020/04/30
- [PULL 14/20] qapi: Assert non-input visitors see only valid narrow integers, Markus Armbruster, 2020/04/30
- [PULL 20/20] qapi: Generate simpler marshalling code when no arguments, Markus Armbruster, 2020/04/30
- [PULL 04/20] qobject: Eliminate qdict_iter(), use qdict_first(), qdict_next(), Markus Armbruster, 2020/04/30
- [PULL 05/20] qemu-option: Clean up after the previous commit,
Markus Armbruster <=
- [PULL 06/20] qapi: Belatedly update visitor.h's big comment for QAPI modules, Markus Armbruster, 2020/04/30
- [PULL 13/20] qapi: Assert output visitors see only valid enum values, Markus Armbruster, 2020/04/30
- [PULL 18/20] qom: Simplify object_property_get_enum(), Markus Armbruster, 2020/04/30
- [PULL 16/20] qapi: Assert non-input visitors see only valid alternate tags, Markus Armbruster, 2020/04/30
- [PULL 15/20] qapi: Clean up visitor's recovery from input with invalid type, Markus Armbruster, 2020/04/30
- [PULL 07/20] qapi: Fix the virtual walk example in visitor.h's big comment, Markus Armbruster, 2020/04/30
- [PULL 19/20] qapi: Disallow qmp_marshal_FOO(NULL, ...), Markus Armbruster, 2020/04/30
- [PULL 17/20] qapi: Only input visitors can actually fail, Markus Armbruster, 2020/04/30
- Re: [PULL 00/20] QAPI patches for 2020-04-30, Peter Maydell, 2020/04/30