Commit 34f708b0 authored by Thomas Huth's avatar Thomas Huth Committed by Jason Wang
Browse files

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: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 136c67e0

include/net/net.h

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ extern const char *legacy_bootp_filename; 


int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp);

int net_client_parse(QemuOptsList *opts_list, const char *str);

int net_init_clients(void);

int net_init_clients(Error **errp);

void net_check_clients(void);

void net_cleanup(void);

void hmp_host_net_add(Monitor *mon, const QDict *qdict);

net/net.c

+5 −24
Original line number Diff line number Diff line
@@ -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 net_client_init(opts, true, errp);

}



    return ret;

}



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;

    }

vl.c

+2 −1
Original line number Diff line number Diff line
@@ -4489,7 +4489,8 @@ int main(int argc, char **argv, char **envp) 


    colo_info_init();



    if (net_init_clients() < 0) {

    if (net_init_clients(&err) < 0) {

        error_report_err(err);

        exit(1);

    }