diff options
| author | Eric Blake <eblake@redhat.com> | 2019-03-27 04:24:38 -0500 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2019-03-27 08:14:42 -0500 |
| commit | 6b90a8473875eb34bae27856857cf6561e079089 (patch) | |
| tree | a29edb52fa42835ce77728a2e74b3278f850647d | |
| parent | 3d7c683a270439072dbaf0dc21e4a7a9b4f7a8fe (diff) | |
| download | libvirt-6b90a8473875eb34bae27856857cf6561e079089.tar.gz | |
snapshot: Allow NULL to virDomainSnapshotObjGetDef
Doing so can simplify some callers.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | src/conf/snapshot_conf.c | 2 | ||||
| -rw-r--r-- | 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 */ |