From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxgox-0001Zm-9E for qemu-devel@nongnu.org; Wed, 27 May 2015 15:16:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxgot-0004UT-PW for qemu-devel@nongnu.org; Wed, 27 May 2015 15:16:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59649) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxgot-0004TU-GN for qemu-devel@nongnu.org; Wed, 27 May 2015 15:16:51 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4RJGntN010209 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 27 May 2015 15:16:50 -0400 Date: Wed, 27 May 2015 21:16:44 +0200 From: Thomas Huth Message-ID: <20150527211644.61b77746@thh440s> In-Reply-To: <1432743412-15943-5-git-send-email-stefanha@redhat.com> References: <1432743412-15943-1-git-send-email-stefanha@redhat.com> <1432743412-15943-5-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 4/5] net: drop if expression that is always true 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:51 +0100 Stefan Hajnoczi wrote: > Both is_netdev and !is_netdev paths already check that > net_client_init_func[opts->kind] is non-NULL so there is no need for the > if statement. > > Signed-off-by: Stefan Hajnoczi > --- > net/net.c | 31 ++++++++++++++----------------- > 1 file changed, 14 insertions(+), 17 deletions(-) > > diff --git a/net/net.c b/net/net.c > index 85a9ddb..cc1793c 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -899,6 +899,7 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) > } u; > const NetClientOptions *opts; > const char *name; > + NetClientState *peer = NULL; > > if (is_netdev) { > u.netdev = object; > @@ -935,25 +936,21 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) > } > } > > - if (net_client_init_fun[opts->kind]) { > - NetClientState *peer = NULL; > + /* 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 -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); > - } > - > - if (net_client_init_fun[opts->kind](opts, name, peer, errp) < 0) { > - /* FIXME drop when all init functions store an Error */ > - if (errp && !*errp) { > - error_set(errp, QERR_DEVICE_INIT_FAILED, > - NetClientOptionsKind_lookup[opts->kind]); > - } > - return -1; > + if (net_client_init_fun[opts->kind](opts, name, peer, errp) < 0) { > + /* FIXME drop when all init functions store an Error */ > + if (errp && !*errp) { > + error_set(errp, QERR_DEVICE_INIT_FAILED, > + NetClientOptionsKind_lookup[opts->kind]); > } > + return -1; > } > return 0; > } Reviewed-by: Thomas Huth