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

On 3/27/19 6:29 AM, Daniel P. Berrangé wrote: > > Presumably the $SUBJECT means this should be squashed into an > earlier patch. Yeah, 10/23. > > 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); This is fallout from patch 2/23, but can't be squashed there because the file checkpoint_conf.c file didn't exist at that point in time. (And I'm not sure how I managed to send 1-3 twice instead of once - especially since those are the non-controversial patches)