[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 19/35] qom: Clean up error reporting in user_crea
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 19/35] qom: Clean up error reporting in user_creatable_add_opts_foreach() |
Date: |
Mon, 15 Oct 2018 13:52:53 +0200 |
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é <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
qemu-io.c | 8 +++-----
qemu-nbd.c | 8 +++-----
qom/object_interfaces.c | 4 +---
vl.c | 16 ++++++----------
4 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index 13829f5e21..6df7731af4 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -620,11 +620,9 @@ int main(int argc, char **argv)
exit(1);
}
- if (qemu_opts_foreach(&qemu_object_opts,
- user_creatable_add_opts_foreach,
- NULL, NULL)) {
- exit(1);
- }
+ qemu_opts_foreach(&qemu_object_opts,
+ user_creatable_add_opts_foreach,
+ NULL, &error_fatal);
if (!trace_init_backends()) {
exit(1);
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 7874bc973c..ca7109652e 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -766,11 +766,9 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
- if (qemu_opts_foreach(&qemu_object_opts,
- user_creatable_add_opts_foreach,
- NULL, NULL)) {
- exit(EXIT_FAILURE);
- }
+ qemu_opts_foreach(&qemu_object_opts,
+ user_creatable_add_opts_foreach,
+ NULL, &error_fatal);
if (!trace_init_backends()) {
exit(1);
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);
diff --git a/vl.c b/vl.c
index 2ef066ad61..bb18f2d995 100644
--- a/vl.c
+++ b/vl.c
@@ -4228,11 +4228,9 @@ int main(int argc, char **argv, char **envp)
page_size_init();
socket_init();
- if (qemu_opts_foreach(qemu_find_opts("object"),
- user_creatable_add_opts_foreach,
- object_create_initial, NULL)) {
- exit(1);
- }
+ qemu_opts_foreach(qemu_find_opts("object"),
+ user_creatable_add_opts_foreach,
+ object_create_initial, &error_fatal);
if (qemu_opts_foreach(qemu_find_opts("chardev"),
chardev_init_func, NULL, NULL)) {
@@ -4363,11 +4361,9 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
- if (qemu_opts_foreach(qemu_find_opts("object"),
- user_creatable_add_opts_foreach,
- object_create_delayed, NULL)) {
- exit(1);
- }
+ qemu_opts_foreach(qemu_find_opts("object"),
+ user_creatable_add_opts_foreach,
+ object_create_delayed, &error_fatal);
if (tpm_init() < 0) {
exit(1);
--
2.17.1
- [Qemu-devel] [PATCH v2 00/35] Replace some unwise uses of error_report() & friends, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 08/35] 9pfs: Fix CLI parsing crash on error, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 12/35] migration: Fix !replay_can_snapshot() error handling, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 03/35] block: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 01/35] error: Fix use of error_prepend() with &error_fatal, &error_abort, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 02/35] Use error_fatal to simplify obvious fatal errors (again), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 22/35] vl: Clean up error reporting in mon_init_func(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 15/35] numa: Fix QMP command set-numa-node error handling, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 19/35] qom: Clean up error reporting in user_creatable_add_opts_foreach(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 20/35] vl: Clean up error reporting in chardev_init_func(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 18/35] vl: Clean up error reporting in parse_add_fd(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 34/35] vl: Fix exit status for -drive format=help, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 11/35] smbios: Clean up error handling in smbios_add(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 21/35] vl: Clean up error reporting in machine_set_property(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 10/35] ioapic: Fix error handling in realize(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 35/35] vl: Simplify call of parse_name(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 32/35] vl: Assert drive_new() does not fail in default_drive(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 25/35] ui/keymaps: Fix handling of erroneous include files, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 14/35] net/socket: Fix invalid socket type error handling, Markus Armbruster, 2018/10/15