ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Markus Armbruster 2018-10-17 10:26:48 +02:00
parent 406b6367e1
commit cd65f34991
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vl.c
View File

@ -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) static int device_init_func(void *opaque, QemuOpts *opts, Error **errp)
{ {
Error *err = NULL;
DeviceState *dev; DeviceState *dev;
dev = qdev_device_add(opts, &err); dev = qdev_device_add(opts, errp);
if (!dev) { if (!dev) {
error_report_err(err);
return -1; return -1;
} }
object_unref(OBJECT(dev)); object_unref(OBJECT(dev));
@ -4492,10 +4490,8 @@ int main(int argc, char **argv, char **envp)
/* init generic devices */ /* init generic devices */
rom_set_order_override(FW_CFG_ORDER_OVERRIDE_DEVICE); rom_set_order_override(FW_CFG_ORDER_OVERRIDE_DEVICE);
if (qemu_opts_foreach(qemu_find_opts("device"), qemu_opts_foreach(qemu_find_opts("device"),
device_init_func, NULL, NULL)) { device_init_func, NULL, &error_fatal);
exit(1);
}
cpu_synchronize_all_post_init(); cpu_synchronize_all_post_init();