From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxglw-0000Un-47 for qemu-devel@nongnu.org; Wed, 27 May 2015 15:13:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxgls-0003Nz-3e for qemu-devel@nongnu.org; Wed, 27 May 2015 15:13:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45284) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxglr-0003Ns-Sc for qemu-devel@nongnu.org; Wed, 27 May 2015 15:13:44 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4RJDhQM008551 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 27 May 2015 15:13:43 -0400 Date: Wed, 27 May 2015 21:13:26 +0200 From: Thomas Huth Message-ID: <20150527211326.263f520b@thh440s> In-Reply-To: <1432743412-15943-4-git-send-email-stefanha@redhat.com> References: <1432743412-15943-1-git-send-email-stefanha@redhat.com> <1432743412-15943-4-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 3/5] net: raise an error if -net type is invalid List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Paolo Bonzini , qemu-devel@nongnu.org, Markus Armbruster On Wed, 27 May 2015 17:16:50 +0100 Stefan Hajnoczi wrote: > 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 > --- > net/net.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/net/net.c b/net/net.c > index 3352b2b..85a9ddb 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -922,6 +922,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_set(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]) { Reviewed-by: Thomas Huth