diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-10-17 10:26:43 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-10-19 14:51:34 +0200 |
| commit | 7e1e0c11127bde81cff260fc6859690435c509d6 (patch) | |
| tree | 745ea82522c4ca1cdf0567358c2accccd16ab18d /qom | |
| parent | 6353218b8c54dc6be6abb01c07a087add07ee5ce (diff) | |
qom: Clean up error reporting in user_creatable_add_opts_foreach()
Calling error_report() in a function that takes an Error ** argument
is suspicious. user_creatable_add_opts_foreach() does that, and then
fails without setting an error. Its caller main(), via
qemu_opts_foreach(), is fine with it, but clean it up anyway.
Cc: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20181017082702.5581-20-armbru@redhat.com>
Diffstat (limited to 'qom')
| -rw-r--r-- | qom/object_interfaces.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 941fd63afd..97b79b48bb 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -143,7 +143,6 @@ int user_creatable_add_opts_foreach(void *opaque, QemuOpts *opts, Error **errp) { bool (*type_opt_predicate)(const char *, QemuOpts *) = opaque; Object *obj = NULL; - Error *err = NULL; const char *type; type = qemu_opt_get(opts, "qom-type"); @@ -152,9 +151,8 @@ int user_creatable_add_opts_foreach(void *opaque, QemuOpts *opts, Error **errp) return 0; } - obj = user_creatable_add_opts(opts, &err); + obj = user_creatable_add_opts(opts, errp); if (!obj) { - error_report_err(err); return -1; } object_unref(obj); |