[libvirt] [PATCH v7 11/23] squash to checkpoint list

[Daniel P. Berrangé]

Presumably the $SUBJECT means this should be squashed into an
earlier patch.

On Wed, Mar 27, 2019 at 05:10:42AM -0500, Eric Blake wrote:
> ---
>  src/conf/checkpoint_conf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c
> index 3dd2acf886..01497a79f6 100644
> --- a/src/conf/checkpoint_conf.c
> +++ b/src/conf/checkpoint_conf.c
> @@ -615,7 +615,7 @@ virDomainCheckpointRedefinePrep(virDomainPtr domain,
>          return -1;
> 
>      other = virDomainCheckpointFindByName(vm->checkpoints, def->common.name);
> -    otherdef = other ? virDomainCheckpointObjGetDef(other) : NULL;
> +    otherdef = virDomainCheckpointObjGetDef(other);
>      if (other) {
>          if (!virDomainDefCheckABIStability(otherdef->common.dom,
>                                             def->common.dom, xmlopt))
> -- 
> 2.20.1
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|