Commit 0a4a0312 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging 



# gpg: Signature made Wed Jun 24 16:37:23 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/net-pull-request:
  net: simplify net_client_init1()
  net: drop if expression that is always true
  net: raise an error if -net type is invalid
  net: replace net_client_init1() netdev whitelist with blacklist
  net: add missing "netmap" to host_net_devices[]

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 58e8b335 1e81aba5

net/net.c

+35 −52
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ const char *host_net_devices[] = { 
#ifdef CONFIG_NET_BRIDGE

    "bridge",

#endif

#ifdef CONFIG_NETMAP

    "netmap",

#endif

#ifdef CONFIG_SLIRP

    "user",

#endif
@@ -910,68 +913,49 @@ static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])( 


static int net_client_init1(const void *object, int is_netdev, Error **errp)

{

    union {

        const Netdev    *netdev;

        const NetLegacy *net;

    } u;

    const NetClientOptions *opts;

    const char *name;

    NetClientState *peer = NULL;



    if (is_netdev) {

        u.netdev = object;

        opts = u.netdev->opts;

        name = u.netdev->id;



        switch (opts->kind) {

#ifdef CONFIG_SLIRP

        case NET_CLIENT_OPTIONS_KIND_USER:

#endif

        case NET_CLIENT_OPTIONS_KIND_TAP:

        case NET_CLIENT_OPTIONS_KIND_SOCKET:

#ifdef CONFIG_VDE

        case NET_CLIENT_OPTIONS_KIND_VDE:

#endif

#ifdef CONFIG_NETMAP

        case NET_CLIENT_OPTIONS_KIND_NETMAP:

#endif

#ifdef CONFIG_NET_BRIDGE

        case NET_CLIENT_OPTIONS_KIND_BRIDGE:

#endif

        case NET_CLIENT_OPTIONS_KIND_HUBPORT:

#ifdef CONFIG_VHOST_NET_USED

        case NET_CLIENT_OPTIONS_KIND_VHOST_USER:

#endif

#ifdef CONFIG_L2TPV3

        case NET_CLIENT_OPTIONS_KIND_L2TPV3:

#endif

            break;

        const Netdev *netdev = object;

        opts = netdev->opts;

        name = netdev->id;



        default:

        if (opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP ||

            opts->kind == NET_CLIENT_OPTIONS_KIND_NIC ||

            !net_client_init_fun[opts->kind]) {

            error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type",

                       "a netdev backend type");

            return -1;

        }

    } else {

        u.net = object;

        opts = u.net->opts;

        const NetLegacy *net = object;

        opts = net->opts;

        /* missing optional values have been initialized to "all bits zero" */

        name = net->has_id ? net->id : net->name;



        if (opts->kind == NET_CLIENT_OPTIONS_KIND_NONE) {

            return 0; /* nothing to do */

        }

        if (opts->kind == NET_CLIENT_OPTIONS_KIND_HUBPORT) {

            error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type",

                       "a net type");

            return -1;

        }

        /* missing optional values have been initialized to "all bits zero" */

        name = u.net->has_id ? u.net->id : u.net->name;

    }



    if (net_client_init_fun[opts->kind]) {

        NetClientState *peer = NULL;

        if (!net_client_init_fun[opts->kind]) {

            error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type",

                       "a net backend type (maybe it is not compiled "

                       "into this binary)");

            return -1;

        }



        /* Do not add to a vlan if it's a -netdev or a nic with a netdev=

         * parameter. */

        if (!is_netdev &&

            (opts->kind != NET_CLIENT_OPTIONS_KIND_NIC ||

             !opts->nic->has_netdev)) {

            peer = net_hub_add_port(u.net->has_vlan ? u.net->vlan : 0, NULL);

        /* Do not add to a vlan if it's a nic with a netdev= parameter. */

        if (opts->kind != NET_CLIENT_OPTIONS_KIND_NIC ||

            !opts->nic->has_netdev) {

            peer = net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL);

        }

    }



    if (net_client_init_fun[opts->kind](opts, name, peer, errp) < 0) {
@@ -982,7 +966,6 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) 
        }

        return -1;

    }

    }

    return 0;

}