[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/5] net: raise an error if -net type is invalid
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 3/5] net: raise an error if -net type is invalid |
Date: |
Wed, 24 Jun 2015 16:37:25 +0100 |
When a -net type is used that was not compiled into the binary there
should be an error message.
Note the special case for -net none, which is a no-op.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-id: address@hidden
---
net/net.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/net/net.c b/net/net.c
index 63450c0..7c1b203 100644
--- a/net/net.c
+++ b/net/net.c
@@ -942,6 +942,17 @@ static int net_client_init1(const void *object, int
is_netdev, Error **errp)
}
/* missing optional values have been initialized to "all bits zero" */
name = u.net->has_id ? u.net->id : u.net->name;
+
+ if (opts->kind == NET_CLIENT_OPTIONS_KIND_NONE) {
+ return 0; /* nothing to do */
+ }
+
+ if (!net_client_init_fun[opts->kind]) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type",
+ "a net backend type (maybe it is not compiled "
+ "into this binary)");
+ return -1;
+ }
}
if (net_client_init_fun[opts->kind]) {
--
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, 2015/06/24
- [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 <=
- Re: [Qemu-devel] [PULL 0/5] Net patches, Peter Maydell, 2015/06/25