[libvirt] [PATCH 12/16] snapshot: Rename virDomainSnapshotObjPtr

John Ferlan jferlan at redhat.com
Thu Mar 21 23:43:01 UTC 2019



On 3/20/19 1:41 AM, Eric Blake wrote:
> Now that the core of SnapshotObj is agnostic to snapshots and can be
> shared with upcoming checkpoint code, it is time to rename the struct
> and the functions specific to list operations. A later patch will
> shuffle which file holds the common code. This is a fairly mechanical
> patch.
> 
> Signed-off-by: Eric Blake <eblake at redhat.com>
> ---
>  src/conf/snapshot_conf.h            |   6 +-
>  src/conf/virconftypes.h             |   6 +-
>  src/conf/virdomainsnapshotobj.h     |  38 +++++------
>  src/conf/virdomainsnapshotobjlist.h |  26 ++++----
>  src/qemu/qemu_command.h             |   2 +-
>  src/qemu/qemu_domain.h              |   6 +-
>  src/qemu/qemu_process.h             |   4 +-
>  src/conf/snapshot_conf.c            |  10 +--
>  src/conf/virdomainsnapshotobj.c     |  96 +++++++++++++-------------
>  src/conf/virdomainsnapshotobjlist.c | 100 ++++++++++++++--------------
>  src/libvirt_private.syms            |  12 ++--
>  src/qemu/qemu_command.c             |   2 +-
>  src/qemu/qemu_domain.c              |  12 ++--
>  src/qemu/qemu_driver.c              |  82 +++++++++++------------
>  src/qemu/qemu_process.c             |   4 +-
>  src/test/test_driver.c              |  58 ++++++++--------
>  src/vz/vz_driver.c                  |  34 +++++-----
>  src/vz/vz_sdk.c                     |   4 +-
>  18 files changed, 251 insertions(+), 251 deletions(-)
> 

One minor nit below... Pretty good for the volume!

Reviewed-by: John Ferlan <jferlan at redhat.com>

John

> diff --git a/src/conf/virdomainsnapshotobj.c b/src/conf/virdomainsnapshotobj.c
> index d6b216c7b2..877a0a9079 100644
> --- a/src/conf/virdomainsnapshotobj.c
> +++ b/src/conf/virdomainsnapshotobj.c
[...]

> 
>  static int
> -virDomainSnapshotActOnDescendant(void *payload,
> -                                 const void *name,
> -                                 void *data)
> +virDomainMomentActOnDescendant(void *payload,
> +                               const void *name,
> +                               void *data)
>  {
> -    virDomainSnapshotObjPtr obj = payload;
> -    struct snapshot_act_on_descendant *curr = data;
> +    virDomainMomentObjPtr obj = payload;
> +    struct moment_act_on_descendant *curr = data;
> 
>      (curr->iter)(payload, name, curr->data);
> -    curr->number += 1 + virDomainSnapshotForEachDescendant(obj,
> +    curr->number += 1 + virDomainMomentForEachDescendant(obj,
>                                                             curr->iter,
>                                                             curr->data);

Need to work adjust the indent on the above 2 lines.

>      return 0;
>  }
> 

[...]




More information about the libvir-list mailing list