From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH 2/5] net: replace net_client_init1() netdev whitelist with blacklist
Date: Wed, 27 May 2015 17:16:49 +0100 [thread overview]
Message-ID: <1432743412-15943-3-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1432743412-15943-1-git-send-email-stefanha@redhat.com>
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>
---
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
next prev parent reply other threads:[~2015-05-27 16:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-27 16:16 [Qemu-devel] [PATCH 0/5] net: error when -net type isn't compiled in Stefan Hajnoczi
2015-05-27 16:16 ` [Qemu-devel] [PATCH 1/5] net: add missing "netmap" to host_net_devices[] Stefan Hajnoczi
2015-05-27 17:39 ` Thomas Huth
2015-05-29 13:18 ` Stefan Hajnoczi
2015-05-27 16:16 ` Stefan Hajnoczi [this message]
2015-05-27 17:42 ` [Qemu-devel] [PATCH 2/5] net: replace net_client_init1() netdev whitelist with blacklist Thomas Huth
2015-05-27 16:16 ` [Qemu-devel] [PATCH 3/5] net: raise an error if -net type is invalid Stefan Hajnoczi
2015-05-27 19:13 ` Thomas Huth
2015-05-27 16:16 ` [Qemu-devel] [PATCH 4/5] net: drop if expression that is always true Stefan Hajnoczi
2015-05-27 19:16 ` Thomas Huth
2015-05-27 16:16 ` [Qemu-devel] [PATCH 5/5] net: simplify net_client_init1() Stefan Hajnoczi
2015-05-27 19:22 ` Thomas Huth
2015-06-18 13:28 ` [Qemu-devel] [PATCH 0/5] net: error when -net type isn't compiled in Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1432743412-15943-3-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=armbru@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).