a30ecde6e7
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>
66 lines
2.6 KiB
C
66 lines
2.6 KiB
C
/*
|
|
* QEMU System Emulator
|
|
*
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
#ifndef QEMU_NET_CLIENTS_H
|
|
#define QEMU_NET_CLIENTS_H
|
|
|
|
#include "net/net.h"
|
|
#include "qapi-types.h"
|
|
|
|
int net_init_dump(const NetClientOptions *opts, const char *name,
|
|
NetClientState *peer, Error **errp);
|
|
|
|
#ifdef CONFIG_SLIRP
|
|
int net_init_slirp(const NetClientOptions *opts, const char *name,
|
|
NetClientState *peer, Error **errp);
|
|
#endif
|
|
|
|
int net_init_hubport(const NetClientOptions *opts, const char *name,
|
|
NetClientState *peer, Error **errp);
|
|
|
|
int net_init_socket(const NetClientOptions *opts, const char *name,
|
|
NetClientState *peer, Error **errp);
|
|
|
|
int net_init_tap(const NetClientOptions *opts, const char *name,
|
|
NetClientState *peer, Error **errp);
|
|
|
|
int net_init_bridge(const NetClientOptions *opts, const char *name,
|
|
NetClientState *peer, Error **errp);
|
|
|
|
int net_init_l2tpv3(const NetClientOptions *opts, const char *name,
|
|
NetClientState *peer, Error **errp);
|
|
#ifdef CONFIG_VDE
|
|
int net_init_vde(const NetClientOptions *opts, const char *name,
|
|
NetClientState *peer, Error **errp);
|
|
#endif
|
|
|
|
#ifdef CONFIG_NETMAP
|
|
int net_init_netmap(const NetClientOptions *opts, const char *name,
|
|
NetClientState *peer, Error **errp);
|
|
#endif
|
|
|
|
int net_init_vhost_user(const NetClientOptions *opts, const char *name,
|
|
NetClientState *peer, Error **errp);
|
|
|
|
#endif /* QEMU_NET_CLIENTS_H */
|