[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/5] net: replace net_client_init1() netdev whitelist
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 2/5] net: replace net_client_init1() netdev whitelist with blacklist |
Date: |
Wed, 24 Jun 2015 16:37:24 +0100 |
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 <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-id: address@hidden
---
net/net.c | 28 +++-------------------------
1 file changed, 3 insertions(+), 25 deletions(-)
diff --git a/net/net.c b/net/net.c
index f43af97..63450c0 100644
--- a/net/net.c
+++ b/net/net.c
@@ -925,31 +925,9 @@ static int net_client_init1(const void *object, int
is_netdev, Error **errp)
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;
-
- 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;
--
2.4.3
- [Qemu-devel] [PULL 0/5] Net patches, Stefan Hajnoczi, 2015/06/24
- [Qemu-devel] [PULL 2/5] net: replace net_client_init1() netdev whitelist with blacklist,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 1/5] net: add missing "netmap" to host_net_devices[], Stefan Hajnoczi, 2015/06/24
- [Qemu-devel] [PULL 5/5] net: simplify net_client_init1(), Stefan Hajnoczi, 2015/06/24
- [Qemu-devel] [PULL 4/5] net: drop if expression that is always true, Stefan Hajnoczi, 2015/06/24
- [Qemu-devel] [PULL 3/5] net: raise an error if -net type is invalid, Stefan Hajnoczi, 2015/06/24
- Re: [Qemu-devel] [PULL 0/5] Net patches, Peter Maydell, 2015/06/25