qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL 3/5] net: raise an error if -net type is invalid
Date: Wed, 24 Jun 2015 16:37:25 +0100	[thread overview]
Message-ID: <1435160247-24134-4-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1435160247-24134-1-git-send-email-stefanha@redhat.com>

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
---
 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

  parent reply	other threads:[~2015-06-24 15:37 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-24 15:37 [Qemu-devel] [PULL 0/5] Net patches Stefan Hajnoczi
2015-06-24 15:37 ` [Qemu-devel] [PULL 1/5] net: add missing "netmap" to host_net_devices[] Stefan Hajnoczi
2015-06-24 15:37 ` [Qemu-devel] [PULL 2/5] net: replace net_client_init1() netdev whitelist with blacklist Stefan Hajnoczi
2015-06-24 15:37 ` Stefan Hajnoczi [this message]
2015-06-24 15:37 ` [Qemu-devel] [PULL 4/5] net: drop if expression that is always true Stefan Hajnoczi
2015-06-24 15:37 ` [Qemu-devel] [PULL 5/5] net: simplify net_client_init1() Stefan Hajnoczi
2015-06-25 14:23 ` [Qemu-devel] [PULL 0/5] Net patches Peter Maydell

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=1435160247-24134-4-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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).