diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-10-17 10:26:55 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-10-19 14:51:34 +0200 |
| commit | b836723dfe642a67904bcd047feaaa0cda662d38 (patch) | |
| tree | ee4fa92c0153cc6a85eaa2b6277189f99b0bed7e /vl.c | |
| parent | 9338570b7b0b8890269222b7b40e0b819f824dab (diff) | |
fsdev: Clean up error reporting in qemu_fsdev_add()
Calling error_report() from within a function that takes an Error **
argument is suspicious. qemu_fsdev_add() does that, and its caller
fsdev_init_func() then fails without setting an error. Its caller
main(), via qemu_opts_foreach(), is fine with it, but clean it up
anyway.
Cc: Greg Kurz <groug@kaod.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Greg Kurz <groug@kaod.org>
Message-Id: <20181017082702.5581-32-armbru@redhat.com>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -2249,7 +2249,7 @@ static int chardev_init_func(void *opaque, QemuOpts *opts, Error **errp) #ifdef CONFIG_VIRTFS static int fsdev_init_func(void *opaque, QemuOpts *opts, Error **errp) { - return qemu_fsdev_add(opts); + return qemu_fsdev_add(opts, errp); } #endif @@ -4236,10 +4236,8 @@ int main(int argc, char **argv, char **envp) chardev_init_func, NULL, &error_fatal); #ifdef CONFIG_VIRTFS - if (qemu_opts_foreach(qemu_find_opts("fsdev"), - fsdev_init_func, NULL, NULL)) { - exit(1); - } + qemu_opts_foreach(qemu_find_opts("fsdev"), + fsdev_init_func, NULL, &error_fatal); #endif if (qemu_opts_foreach(qemu_find_opts("device"), |