From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxe0u-0003e3-Uc for qemu-devel@nongnu.org; Wed, 27 May 2015 12:17:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxe0p-0007wa-0b for qemu-devel@nongnu.org; Wed, 27 May 2015 12:17:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxe0o-0007wW-RT for qemu-devel@nongnu.org; Wed, 27 May 2015 12:16:58 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 8F6298EB4C for ; Wed, 27 May 2015 16:16:58 +0000 (UTC) From: Stefan Hajnoczi Date: Wed, 27 May 2015 17:16:49 +0100 Message-Id: <1432743412-15943-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1432743412-15943-1-git-send-email-stefanha@redhat.com> References: <1432743412-15943-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 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: Paolo Bonzini , Markus Armbruster , 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 --- net/net.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/net/net.c b/net/net.c index c5349d2..3352b2b 100644 --- a/net/net.c +++ b/net/net.c @@ -905,31 +905,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_set(errp, QERR_INVALID_PARAMETER_VALUE, "type", "a netdev backend type"); return -1; -- 2.4.1