ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: replace net_client_init1() netdev whitelist with blacklist 

It's cumbersome to keep the whitelist up-to-date.  New netdev backends
should most likely be allowed so a blacklist makes more sense than a
whitelist.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 1432743412-15943-3-git-send-email-stefanha@redhat.com
This commit is contained in:
Stefan Hajnoczi 2015-05-27 17:16:49 +01:00
parent 027a247bbf
commit 1322629b4f
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
net/net.c
View File

@ -925,31 +925,9 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp)
opts = u.netdev->opts; opts = u.netdev->opts;
name = u.netdev->id; name = u.netdev->id;
switch (opts->kind) { if (opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP ||
#ifdef CONFIG_SLIRP opts->kind == NET_CLIENT_OPTIONS_KIND_NIC ||
case NET_CLIENT_OPTIONS_KIND_USER: !net_client_init_fun[opts->kind]) {
#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;
default:
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type", error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type",
"a netdev backend type"); "a netdev backend type");
return -1; return -1;