Re: [Qemu-devel] [PATCH 5/5] net: simplify net_client_init1()

[Thomas Huth]

On Wed, 27 May 2015 17:16:52 +0100
Stefan Hajnoczi <address@hidden> wrote:

> Drop the union and move the hubport creation into the !is_netdev case.
> 
> Signed-off-by: Stefan Hajnoczi <address@hidden>
> ---
>  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 <address@hidden>