diff options
author | Markus Armbruster <armbru@redhat.com> | 2018-10-17 10:26:48 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2018-10-19 14:51:34 +0200 |
commit | cd65f34991f01c23c9e3e1691953b79e36a1b911 (patch) | |
tree | 4037c1d558b66e21c864c58b1e61ab33be25316a /vl.c | |
parent | 406b6367e19cdaf4ad948c469f82875f8af24ab2 (diff) | |
download | qemu-cd65f34991f01c23c9e3e1691953b79e36a1b911.zip qemu-cd65f34991f01c23c9e3e1691953b79e36a1b911.tar.gz qemu-cd65f34991f01c23c9e3e1691953b79e36a1b911.tar.bz2 |
vl: Clean up error reporting in device_init_func()
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 <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20181017082702.5581-25-armbru@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -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)); @@ -4492,10 +4490,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(); |