[libvirt] [PATCH 12/19] virsh: Add mac completion to net-dhcp-leases command

[Michal Privoznik]

On 11/2/20 9:26 AM, Lin Ma wrote:
> Signed-off-by: Lin Ma <lma at suse.com>
> ---
>   tools/virsh-completer-network.c | 45 +++++++++++++++++++++++++++++++++
>   tools/virsh-completer-network.h |  4 +++
>   tools/virsh-network.c           | 15 +++++++----
>   3 files changed, 59 insertions(+), 5 deletions(-)
> 
> diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-network.c
> index 73f7115ab2..58bc126693 100644
> --- a/tools/virsh-completer-network.c
> +++ b/tools/virsh-completer-network.c
> @@ -174,3 +174,48 @@ virshNetworkUUIDCompleter(vshControl *ctl,
>       g_free(nets);
>       return ret;
>   }
> +
> +
> +char **
> +virshNetworkDhcpMacCompleter(vshControl *ctl,
> +                             const vshCmd *cmd,
> +                             unsigned int flags)
> +{
> +    virshControlPtr priv = ctl->privData;
> +    virNetworkDHCPLeasePtr *leases = NULL;
> +    virNetworkPtr network = NULL;
> +    int nleases;
> +    size_t i = 0;
> +    char **ret = NULL;
> +    VIR_AUTOSTRINGLIST tmp = NULL;
> +
> +    virCheckFlags(0, NULL);
> +
> +    if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
> +        return NULL;
> +
> +    if (!(network = virshCommandOptNetwork(ctl, cmd, NULL)))
> +        return NULL;
> +
> +    if ((nleases = virNetworkGetDHCPLeases(network, NULL, &leases, flags)) < 0) {
> +        goto cleanup;
> +    }
> +

These curly braces look redundant, superfluous.

> +    tmp = g_new0(char *, nleases + 1);
> +
> +    for (i = 0; i < nleases; i++) {
> +        virNetworkDHCPLeasePtr lease = leases[i];
> +        tmp[i] = g_strdup(lease->mac);
> +    }
> +
> +    ret = g_steal_pointer(&tmp);
> +
> + cleanup:
> +    if (leases) {
> +        for (i = 0; i < nleases; i++)
> +            virNetworkDHCPLeaseFree(leases[i]);
> +        VIR_FREE(leases);
> +    }
> +    virNetworkFree(network);
> +    return ret;
> +}


Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal