]> git.proxmox.com Git - mirror_qemu.git/commit - net/slirp.c
net: Permit incremental conversion of init functions to Error
authorMarkus Armbruster <armbru@redhat.com>
Fri, 15 May 2015 11:58:50 +0000 (13:58 +0200)
committerStefan Hajnoczi <stefanha@redhat.com>
Wed, 27 May 2015 08:51:04 +0000 (09:51 +0100)
commita30ecde6e795682d1473c45acae66a60a76fca2f
treec7e546745660f2427f34a294f44940ce1721fc1f
parentca7eb1848bb06d9b75784d7760b83c7b0beb1102
net: Permit incremental conversion of init functions to Error

Error reporting for netdev_add is broken: the net_client_init_fun[]
report the actual errors with (at best) error_report(), and their
caller net_client_init1() makes up a generic error on top.

For command line and HMP, this produces an mildly ugly error cascade.

In QMP, the actual errors go to stderr, and the generic error becomes
the command's error reply.

To fix this, we need to convert the net_client_init_fun[] to Error.

To permit fixing them one by one, add an Error ** parameter to the
net_client_init_fun[].  If the call fails without returning an Error,
make up the same generic Error as before.  But if it returns one, use
that instead.  Since none of them does so far, no functional change.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1431691143-1015-3-git-send-email-armbru@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
12 files changed:
net/clients.h
net/dump.c
net/hub.c
net/l2tpv3.c
net/net.c
net/netmap.c
net/slirp.c
net/socket.c
net/tap-win32.c
net/tap.c
net/vde.c
net/vhost-user.c