From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxfLa-0004NK-QZ for qemu-devel@nongnu.org; Wed, 27 May 2015 13:42:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxfLX-0005qB-KI for qemu-devel@nongnu.org; Wed, 27 May 2015 13:42:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46872) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxfLX-0005q1-Es for qemu-devel@nongnu.org; Wed, 27 May 2015 13:42:27 -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 E98AD21A5 for ; Wed, 27 May 2015 17:42:26 +0000 (UTC) Date: Wed, 27 May 2015 19:42:21 +0200 From: Thomas Huth Message-ID: <20150527194221.404033c3@thh440s> In-Reply-To: <1432743412-15943-3-git-send-email-stefanha@redhat.com> References: <1432743412-15943-1-git-send-email-stefanha@redhat.com> <1432743412-15943-3-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [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: Stefan Hajnoczi Cc: Paolo Bonzini , qemu-devel@nongnu.org, Markus Armbruster On Wed, 27 May 2015 17:16:49 +0100 Stefan Hajnoczi wrote: > 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; Reviewed-by: Thomas Huth