[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 24/35] vl: Clean up error reporting in device_ini
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 24/35] vl: Clean up error reporting in device_init_func() |
Date: |
Mon, 15 Oct 2018 13:52:58 +0200 |
Calling error_report() in a function that takes an Error ** argument
is suspicious. device_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>
---
vl.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/vl.c b/vl.c
index c5bc54f72b..c053117028 100644
--- a/vl.c
+++ b/vl.c
@@ -2222,12 +2222,10 @@ static int device_help_func(void *opaque, QemuOpts
*opts, Error **errp)
static int device_init_func(void *opaque, QemuOpts *opts, Error **errp)
{
- Error *err = NULL;
DeviceState *dev;
- dev = qdev_device_add(opts, &err);
+ dev = qdev_device_add(opts, errp);
if (!dev) {
- error_report_err(err);
return -1;
}
object_unref(OBJECT(dev));
@@ -4491,10 +4489,8 @@ int main(int argc, char **argv, char **envp)
/* init generic devices */
rom_set_order_override(FW_CFG_ORDER_OVERRIDE_DEVICE);
- if (qemu_opts_foreach(qemu_find_opts("device"),
- device_init_func, NULL, NULL)) {
- exit(1);
- }
+ qemu_opts_foreach(qemu_find_opts("device"),
+ device_init_func, NULL, &error_fatal);
cpu_synchronize_all_post_init();
--
2.17.1
- [Qemu-devel] [PATCH v2 06/35] vfio: Clean up error reporting after previous commit, (continued)
- [Qemu-devel] [PATCH v2 06/35] vfio: Clean up error reporting after previous commit, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 27/35] vnc: Clean up error reporting in vnc_init_func(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 30/35] spice: Clean up error reporting in add_channel(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 28/35] numa: Clean up error reporting in parse_numa(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 23/35] vl: Clean up error reporting in parse_fw_cfg(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 04/35] cpus hw target: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 16/35] xen/pt: Fix incomplete conversion to realize(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 13/35] l2tpv3: Improve -netdev/netdev_add/-net/... error reporting, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 24/35] vl: Clean up error reporting in device_init_func(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 31/35] fsdev: Clean up error reporting in qemu_fsdev_add(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 26/35] ui: Convert vnc_display_init(), init_keyboard_layout() to Error, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 17/35] seccomp: Clean up error reporting in parse_sandbox(), Markus Armbruster, 2018/10/15