aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2015-05-27 17:16:50 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2015-06-24 16:33:20 +0100
commitd139e9a6cf01b8c31f5904b4ba40521d7224f7de (patch)
treef25bd114074ebe3b4804a2c355ac0de256075685 /net
parent1322629b4f25730aed973d51983e7a3b021fe9c9 (diff)
net: raise an error if -net type is invalid
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 <stefanha@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-id: 1432743412-15943-4-git-send-email-stefanha@redhat.com
Diffstat (limited to 'net')
-rw-r--r--net/net.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/net.c b/net/net.c
index 63450c0300..7c1b203b46 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]) {