From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys8u8-0007R6-AK for qemu-devel@nongnu.org; Tue, 12 May 2015 08:03:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ys8tz-0003xf-DB for qemu-devel@nongnu.org; Tue, 12 May 2015 08:03:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47434) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys8tz-0003wv-6K for qemu-devel@nongnu.org; Tue, 12 May 2015 08:03:11 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4CC398p008929 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 12 May 2015 08:03:10 -0400 From: Markus Armbruster Date: Tue, 12 May 2015 14:02:53 +0200 Message-Id: <1431432187-10993-2-git-send-email-armbru@redhat.com> In-Reply-To: <1431432187-10993-1-git-send-email-armbru@redhat.com> References: <1431432187-10993-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 01/15] net: Improve error message for -net hubport a bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@redhat.com 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 --- 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