[libvirt] [PATCHv2 09/13] list: use the new snapshot API in virsh when possible

Peter Krempa pkrempa at redhat.com
Mon Jun 18 12:40:45 UTC 2012


On 06/15/12 06:18, Eric Blake wrote:
> Using the new API is so much shorter than the rest of the remainder
> of the function.
>
> * tools/virsh.c (vshSnapshotList): Use the new API.
> ---
>
> v2: fixes needed to pass testing
>
>   tools/virsh.c |   31 ++++++++++++++++++++++++++++++-
>   1 file changed, 30 insertions(+), 1 deletion(-)
>
> diff --git a/tools/virsh.c b/tools/virsh.c
> index 3e1018e..13b1c01 100644
> --- a/tools/virsh.c
> +++ b/tools/virsh.c
> @@ -17002,13 +17002,42 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom,
> +    if (count >= 0) {
> +        /* When mixing --from and --tree, we also want a copy of from
> +         * in the list, but with no parent for that one entry.  */
> +        snaplist->snaps = vshCalloc(ctl, sizeof(*snaplist->snaps),
> +                                    count + (tree && from));

A little bit awkward on the first read, but correct.

> +        snaplist->nsnaps = count;
> +        for (i = 0; i < count; i++)
> +            snaplist->snaps[i].snap = snaps[i];
> +        VIR_FREE(snaps);


ACK.

Peter




More information about the libvir-list mailing list