[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 20/38] vl: Clean up error reporting in chardev_in
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v4 20/38] vl: Clean up error reporting in chardev_init_func() |
Date: |
Wed, 17 Oct 2018 10:26:44 +0200 |
Calling error_report() in a function that takes an Error ** argument
is suspicious. chardev_init_func() 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.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
vl.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/vl.c b/vl.c
index bb18f2d995..aa03192019 100644
--- a/vl.c
+++ b/vl.c
@@ -2239,7 +2239,7 @@ static int chardev_init_func(void *opaque, QemuOpts
*opts, Error **errp)
if (!qemu_chr_new_from_opts(opts, &local_err)) {
if (local_err) {
- error_report_err(local_err);
+ error_propagate(errp, local_err);
return -1;
}
exit(0);
@@ -4232,10 +4232,8 @@ int main(int argc, char **argv, char **envp)
user_creatable_add_opts_foreach,
object_create_initial, &error_fatal);
- if (qemu_opts_foreach(qemu_find_opts("chardev"),
- chardev_init_func, NULL, NULL)) {
- exit(1);
- }
+ qemu_opts_foreach(qemu_find_opts("chardev"),
+ chardev_init_func, NULL, &error_fatal);
#ifdef CONFIG_VIRTFS
if (qemu_opts_foreach(qemu_find_opts("fsdev"),
--
2.17.1
- [Qemu-devel] [PATCH v4 01/38] error: Fix use of error_prepend() with &error_fatal, &error_abort, (continued)
- [Qemu-devel] [PATCH v4 01/38] error: Fix use of error_prepend() with &error_fatal, &error_abort, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 16/38] xen/pt: Fix incomplete conversion to realize(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 02/38] Use error_fatal to simplify obvious fatal errors (again), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 08/38] 9pfs: Fix CLI parsing crash on error, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 03/38] block: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 18/38] vl: Clean up error reporting in parse_add_fd(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 11/38] smbios: Clean up error handling in smbios_add(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 20/38] vl: Clean up error reporting in chardev_init_func(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v4 15/38] numa: Fix QMP command set-numa-node error handling, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 13/38] l2tpv3: Improve -netdev/netdev_add/-net/... error reporting, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 22/38] vl: Clean up error reporting in mon_init_func(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 27/38] vnc: Clean up error reporting in vnc_init_func(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 21/38] vl: Clean up error reporting in machine_set_property(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 06/38] vfio: Clean up error reporting after previous commit, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 19/38] qom: Clean up error reporting in user_creatable_add_opts_foreach(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 23/38] vl: Clean up error reporting in parse_fw_cfg(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 24/38] vl: Clean up error reporting in device_init_func(), Markus Armbruster, 2018/10/17