Re: [Qemu-devel] [PATCH 4/5] net: drop if expression that is always true

[Thomas Huth <thuth@redhat.com>]

On Wed, 27 May 2015 17:16:51 +0100
Stefan Hajnoczi <stefanha@redhat.com> 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 <stefanha@redhat.com>
> ---
>  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 <thuth@redhat.com>