From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7mk2-0003O5-VE for qemu-devel@nongnu.org; Wed, 24 Jun 2015 11:37:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7mk1-0003h1-Vy for qemu-devel@nongnu.org; Wed, 24 Jun 2015 11:37:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53737) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7mk1-0003gu-RU for qemu-devel@nongnu.org; Wed, 24 Jun 2015 11:37:33 -0400 From: Stefan Hajnoczi Date: Wed, 24 Jun 2015 16:37:24 +0100 Message-Id: <1435160247-24134-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1435160247-24134-1-git-send-email-stefanha@redhat.com> References: <1435160247-24134-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 2/5] net: replace net_client_init1() netdev whitelist with blacklist List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi 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 Reviewed-by: Thomas Huth Message-id: 1432743412-15943-3-git-send-email-stefanha@redhat.com --- 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