From 6b90a8473875eb34bae27856857cf6561e079089 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 27 Mar 2019 04:24:38 -0500 Subject: [PATCH] snapshot: Allow NULL to virDomainSnapshotObjGetDef MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Doing so can simplify some callers. Signed-off-by: Eric Blake Reviewed-by: Daniel P. Berrangé --- src/conf/snapshot_conf.c | 2 +- src/conf/virdomainsnapshotobjlist.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 4ce120451e..8e4f3d9410 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -967,7 +967,7 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain, } other = virDomainSnapshotFindByName(vm->snapshots, def->common.name); - otherdef = other ? virDomainSnapshotObjGetDef(other) : NULL; + otherdef = virDomainSnapshotObjGetDef(other); check_if_stolen = other && otherdef->common.dom; if (virDomainSnapshotRedefineValidate(def, domain->uuid, other, xmlopt, flags) < 0) { diff --git a/src/conf/virdomainsnapshotobjlist.h b/src/conf/virdomainsnapshotobjlist.h index b83f7a4ba9..12b574b4ff 100644 --- a/src/conf/virdomainsnapshotobjlist.h +++ b/src/conf/virdomainsnapshotobjlist.h @@ -87,7 +87,7 @@ int virDomainListSnapshots(virDomainSnapshotObjListPtr snapshots, static inline virDomainSnapshotDefPtr virDomainSnapshotObjGetDef(virDomainMomentObjPtr obj) { - return (virDomainSnapshotDefPtr) obj->def; + return obj ? (virDomainSnapshotDefPtr) obj->def : NULL; } #endif /* LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H */ -- 2.47.2