提交 6b90a847 编写于 作者: E Eric Blake

snapshot: Allow NULL to virDomainSnapshotObjGetDef

Doing so can simplify some callers.
Signed-off-by: NEric Blake <eblake@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 3d7c683a
...@@ -967,7 +967,7 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain, ...@@ -967,7 +967,7 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain,
} }
other = virDomainSnapshotFindByName(vm->snapshots, def->common.name); other = virDomainSnapshotFindByName(vm->snapshots, def->common.name);
otherdef = other ? virDomainSnapshotObjGetDef(other) : NULL; otherdef = virDomainSnapshotObjGetDef(other);
check_if_stolen = other && otherdef->common.dom; check_if_stolen = other && otherdef->common.dom;
if (virDomainSnapshotRedefineValidate(def, domain->uuid, other, xmlopt, if (virDomainSnapshotRedefineValidate(def, domain->uuid, other, xmlopt,
flags) < 0) { flags) < 0) {
......
...@@ -87,7 +87,7 @@ int virDomainListSnapshots(virDomainSnapshotObjListPtr snapshots, ...@@ -87,7 +87,7 @@ int virDomainListSnapshots(virDomainSnapshotObjListPtr snapshots,
static inline virDomainSnapshotDefPtr static inline virDomainSnapshotDefPtr
virDomainSnapshotObjGetDef(virDomainMomentObjPtr obj) virDomainSnapshotObjGetDef(virDomainMomentObjPtr obj)
{ {
return (virDomainSnapshotDefPtr) obj->def; return obj ? (virDomainSnapshotDefPtr) obj->def : NULL;
} }
#endif /* LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H */ #endif /* LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册