[libvirt PATCH 04/20] snapshot_conf: introduce <revertDisks> metadata element

Peter Krempa pkrempa at redhat.com
Mon Apr 3 13:45:50 UTC 2023


On Mon, Mar 13, 2023 at 16:42:05 +0100, Pavel Hrdina wrote:
> This new element will hold the new disk overlay created when reverting
> to non-leaf snapshot in order to remember the files libvirt created.
> 
> Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
> ---
>  src/conf/schemas/domainsnapshot.rng |  7 +++++++
>  src/conf/snapshot_conf.c            | 27 +++++++++++++++++++++++++++
>  src/conf/snapshot_conf.h            |  5 +++++
>  3 files changed, 39 insertions(+)

[...]

> diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
> index da1c694cb9..949104c1fd 100644
> --- a/src/conf/snapshot_conf.c
> +++ b/src/conf/snapshot_conf.c

[...]

> @@ -843,6 +859,17 @@ virDomainSnapshotDefFormatInternal(virBuffer *buf,
>          virBufferAddLit(buf, "</disks>\n");
>      }
>  
> +    if (def->nrevertdisks) {

Always use explicit comparison against 0 for non-pointer, non-booleans.

> +        virBufferAddLit(buf, "<revertDisks>\n");
> +        virBufferAdjustIndent(buf, 2);
> +        for (i = 0; i < def->nrevertdisks; i++) {
> +            if (virDomainSnapshotDiskDefFormat(buf, &def->revertdisks[i], xmlopt) < 0)
> +                return -1;
> +        }
> +        virBufferAdjustIndent(buf, -2);
> +        virBufferAddLit(buf, "</revertDisks>\n");

Also preferrably use virXMLFormatElement.

> +    }
> +
>      if (def->parent.dom) {
>          if (virDomainDefFormatInternal(def->parent.dom, xmlopt,
>                                         buf, domainflags) < 0)

Reviewed-by: Peter Krempa <pkrempa at redhat.com>


More information about the libvir-list mailing list