summaryrefslogtreecommitdiff
path: root/net/hub.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-05-15 13:58:50 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2015-05-27 09:51:04 +0100
commita30ecde6e795682d1473c45acae66a60a76fca2f (patch)
treec7e546745660f2427f34a294f44940ce1721fc1f /net/hub.c
parentca7eb1848bb06d9b75784d7760b83c7b0beb1102 (diff)
downloadqemu-a30ecde6e795682d1473c45acae66a60a76fca2f.tar.gz
qemu-a30ecde6e795682d1473c45acae66a60a76fca2f.tar.bz2
qemu-a30ecde6e795682d1473c45acae66a60a76fca2f.zip
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>
Diffstat (limited to 'net/hub.c')
-rw-r--r--net/hub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/hub.c b/net/hub.c
index 261f8ccc3f..3047f12766 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -281,7 +281,7 @@ int net_hub_id_for_client(NetClientState *nc, int *id)
}
int net_init_hubport(const NetClientOptions *opts, const char *name,
- NetClientState *peer)
+ NetClientState *peer, Error **errp)
{
const NetdevHubPortOptions *hubport;