diff options
author | Thomas Huth <thuth@redhat.com> | 2018-02-21 11:18:30 +0100 |
---|---|---|
committer | Jason Wang <jasowang@redhat.com> | 2018-03-05 10:25:23 +0800 |
commit | 34f708b0b6bef9ac1e371879a47df5b5fb95726f (patch) | |
tree | 4bc24b49498b8827e3566e60fdc2960c13c1b2b0 /net | |
parent | 136c67e07869227b21b3f627316e03679ce7b738 (diff) | |
download | qemu-34f708b0b6bef9ac1e371879a47df5b5fb95726f.zip qemu-34f708b0b6bef9ac1e371879a47df5b5fb95726f.tar.gz qemu-34f708b0b6bef9ac1e371879a47df5b5fb95726f.tar.bz2 |
net: Move error reporting from net_init_client/netdev to the calling site
It looks strange that net_init_client() and net_init_netdev() both
take an "Error **errp" parameter, but then do the error reporting
with "error_report_err(local_err)" on their own. Let's move the
error reporting to the calling site instead to simplify this code
a little bit.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/net.c | 29 |
1 files changed, 5 insertions, 24 deletions
@@ -1520,46 +1520,27 @@ void net_check_clients(void) static int net_init_client(void *dummy, QemuOpts *opts, Error **errp) { - Error *local_err = NULL; - - net_client_init(opts, false, &local_err); - if (local_err) { - error_report_err(local_err); - return -1; - } - - return 0; + return net_client_init(opts, false, errp); } static int net_init_netdev(void *dummy, QemuOpts *opts, Error **errp) { - Error *local_err = NULL; - int ret; - - ret = net_client_init(opts, true, &local_err); - if (local_err) { - error_report_err(local_err); - return -1; - } - - return ret; + return net_client_init(opts, true, errp); } -int net_init_clients(void) +int net_init_clients(Error **errp) { - QemuOptsList *net = qemu_find_opts("net"); - net_change_state_entry = qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL); QTAILQ_INIT(&net_clients); if (qemu_opts_foreach(qemu_find_opts("netdev"), - net_init_netdev, NULL, NULL)) { + net_init_netdev, NULL, errp)) { return -1; } - if (qemu_opts_foreach(net, net_init_client, NULL, NULL)) { + if (qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL, errp)) { return -1; } |