[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/15] net: Improve error message for -net hubport a
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 01/15] net: Improve error message for -net hubport a bit |
Date: |
Tue, 12 May 2015 14:02:53 +0200 |
Type "hubport" is valid only with -netdev. Unfortunately, that's
detected late and the error message doesn't explain why:
$ qemu-system-i386 -net hubport,id=foo,hubid=0
qemu-system-i386: -net hubport,id=foo,hubid=0: Device 'hubport' could not
be initialized
Improve the error message to "Parameter 'type' expects a net type".
Not fixed: -net hubport without the parameters required by -netdev
hubport still asks for those parameters:
$ qemu-system-i386 -net hubport
qemu-system-i386: -net hubport: Parameter 'hubid' is missing
Signed-off-by: Markus Armbruster <address@hidden>
---
net/hub.c | 5 +----
net/net.c | 5 +++++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/net/hub.c b/net/hub.c
index 2b60ab9..261f8cc 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -286,12 +286,9 @@ int net_init_hubport(const NetClientOptions *opts, const
char *name,
const NetdevHubPortOptions *hubport;
assert(opts->kind == NET_CLIENT_OPTIONS_KIND_HUBPORT);
+ assert(!peer);
hubport = opts->hubport;
- if (peer) {
- return -EINVAL;
- }
-
net_hub_add_port(hubport->hubid, name);
return 0;
}
diff --git a/net/net.c b/net/net.c
index 0be084d..06affd6 100644
--- a/net/net.c
+++ b/net/net.c
@@ -875,6 +875,11 @@ static int net_client_init1(const void *object, int
is_netdev, Error **errp)
} else {
u.net = object;
opts = u.net->opts;
+ if (opts->kind == NET_CLIENT_OPTIONS_KIND_HUBPORT) {
+ error_set(errp, QERR_INVALID_PARAMETER_VALUE, "type",
+ "a net type");
+ return -1;
+ }
/* missing optional values have been initialized to "all bits zero" */
name = u.net->has_id ? u.net->id : u.net->name;
}
--
1.9.3
- Re: [Qemu-devel] [PATCH 05/15] tap: net_tap_fd_init() can't fail, drop dead error handling, (continued)
- [Qemu-devel] [PATCH 06/15] tap: Improve -netdev/netdev_add/-net/... bridge error reporting, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 11/15] tap-linux: Convert tap_open() to Error, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 10/15] tap: Permit incremental conversion of tap_open() to Error, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 12/15] tap-bsd: Convert tap_open() to Error, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 01/15] net: Improve error message for -net hubport a bit,
Markus Armbruster <=
- [Qemu-devel] [PATCH 09/15] tap: Convert launch_script() to Error, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 13/15] tap-solaris: Convert tap_open() to Error, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 02/15] net: Permit incremental conversion of init functions to Error, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 15/15] tap: Improve -netdev/netdev_add/-net/... tap error reporting, Markus Armbruster, 2015/05/12