[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 24/38] vl: Clean up error reporting in device_ini
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 24/38] vl: Clean up error reporting in device_init_func() |
Date: |
Tue, 16 Oct 2018 19:41:44 +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 v3 02/38] Use error_fatal to simplify obvious fatal errors (again), (continued)
- [Qemu-devel] [PATCH v3 02/38] Use error_fatal to simplify obvious fatal errors (again), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 11/38] smbios: Clean up error handling in smbios_add(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 16/38] xen/pt: Fix incomplete conversion to realize(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 15/38] numa: Fix QMP command set-numa-node error handling, Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 14/38] net/socket: Fix invalid socket type error handling, Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 22/38] vl: Clean up error reporting in mon_init_func(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 06/38] vfio: Clean up error reporting after previous commit, Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 29/38] tpm: Clean up error reporting in tpm_init_tpmdev(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 32/38] vl: Assert drive_new() does not fail in default_drive(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 38/38] vpc: Fail open on bad header checksum, Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 24/38] vl: Clean up error reporting in device_init_func(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 21/38] vl: Clean up error reporting in machine_set_property(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 23/38] vl: Clean up error reporting in parse_fw_cfg(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 19/38] qom: Clean up error reporting in user_creatable_add_opts_foreach(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 17/38] seccomp: Clean up error reporting in parse_sandbox(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 37/38] raw: Convert a warning to warn_report(), Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 36/38] block: Clean up bdrv_img_create()'s error reporting, Markus Armbruster, 2018/10/16
- [Qemu-devel] [PATCH v3 27/38] vnc: Clean up error reporting in vnc_init_func(), Markus Armbruster, 2018/10/16