From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxguB-0002uv-OR for qemu-devel@nongnu.org; Wed, 27 May 2015 15:22:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxgu8-00066B-GL for qemu-devel@nongnu.org; Wed, 27 May 2015 15:22:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxgu8-000661-8N for qemu-devel@nongnu.org; Wed, 27 May 2015 15:22:16 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4RJMEXO022328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 27 May 2015 15:22:14 -0400 Date: Wed, 27 May 2015 21:22:07 +0200 From: Thomas Huth Message-ID: <20150527212207.17162ba2@thh440s> In-Reply-To: <1432743412-15943-6-git-send-email-stefanha@redhat.com> References: <1432743412-15943-1-git-send-email-stefanha@redhat.com> <1432743412-15943-6-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 5/5] net: simplify net_client_init1() 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:52 +0100 Stefan Hajnoczi wrote: > Drop the union and move the hubport creation into the !is_netdev case. > > Signed-off-by: Stefan Hajnoczi > --- > net/net.c | 38 ++++++++++++++++---------------------- > 1 file changed, 16 insertions(+), 22 deletions(-) > > diff --git a/net/net.c b/net/net.c > index cc1793c..e57a089 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -893,18 +893,14 @@ static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])( > > static int net_client_init1(const void *object, int is_netdev, Error **errp) > { > - union { > - const Netdev *netdev; > - const NetLegacy *net; > - } u; > const NetClientOptions *opts; > const char *name; > NetClientState *peer = NULL; > > if (is_netdev) { > - u.netdev = object; > - opts = u.netdev->opts; > - name = u.netdev->id; > + const Netdev *netdev = object; > + opts = netdev->opts; > + name = netdev->id; > > if (opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP || > opts->kind == NET_CLIENT_OPTIONS_KIND_NIC || > @@ -914,19 +910,19 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) > return -1; > } > } 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; > - } > + const NetLegacy *net = object; > + opts = net->opts; > /* missing optional values have been initialized to "all bits zero" */ > - name = u.net->has_id ? u.net->id : u.net->name; > + name = net->has_id ? net->id : net->name; > > if (opts->kind == NET_CLIENT_OPTIONS_KIND_NONE) { > return 0; /* nothing to do */ > } > + if (opts->kind == NET_CLIENT_OPTIONS_KIND_HUBPORT) { > + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "type", > + "a net type"); > + return -1; > + } > > if (!net_client_init_fun[opts->kind]) { > error_set(errp, QERR_INVALID_PARAMETER_VALUE, "type", > @@ -934,14 +930,12 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) > "into this binary)"); > return -1; > } > - } > > - /* Do not add to a vlan if it's a -netdev or a nic with a netdev= > - * parameter. */ > - if (!is_netdev && > - (opts->kind != NET_CLIENT_OPTIONS_KIND_NIC || > - !opts->nic->has_netdev)) { > - peer = net_hub_add_port(u.net->has_vlan ? u.net->vlan : 0, NULL); > + /* Do not add to a vlan if it's a nic with a netdev= parameter. */ > + if (opts->kind != NET_CLIENT_OPTIONS_KIND_NIC || > + !opts->nic->has_netdev) { > + peer = net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL); > + } > } > > if (net_client_init_fun[opts->kind](opts, name, peer, errp) < 0) { Reviewed-by: Thomas Huth