From 504b108cb96bc5485fe3928aaccb29d141d50637 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 12 Jan 2022 14:56:04 +0100 Subject: [PATCH] virDomainSnapshotRedefinePrep: Use 'snapdef' for snapshot definition object MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We use this variable name to distinguish it from the domain definition. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/snapshot_conf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 1d61f93b65..4d2cfae128 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -980,23 +980,23 @@ virDomainSnapshotRedefinePrep(virDomainObj *vm, virDomainXMLOption *xmlopt, unsigned int flags) { - virDomainSnapshotDef *def = *defptr; + virDomainSnapshotDef *snapdef = *defptr; virDomainMomentObj *other; virDomainSnapshotDef *otherdef = NULL; bool check_if_stolen; - if (virDomainSnapshotCheckCycles(vm->snapshots, def, vm->def->name) < 0) + if (virDomainSnapshotCheckCycles(vm->snapshots, snapdef, vm->def->name) < 0) return -1; - other = virDomainSnapshotFindByName(vm->snapshots, def->parent.name); + other = virDomainSnapshotFindByName(vm->snapshots, snapdef->parent.name); if (other) otherdef = virDomainSnapshotObjGetDef(other); check_if_stolen = other && otherdef->parent.dom; - if (virDomainSnapshotRedefineValidate(def, vm->def->uuid, other, xmlopt, + if (virDomainSnapshotRedefineValidate(snapdef, vm->def->uuid, other, xmlopt, flags) < 0) { /* revert any stealing of the snapshot domain definition */ - if (check_if_stolen && def->parent.dom && !otherdef->parent.dom) - otherdef->parent.dom = g_steal_pointer(&def->parent.dom); + if (check_if_stolen && snapdef->parent.dom && !otherdef->parent.dom) + otherdef->parent.dom = g_steal_pointer(&snapdef->parent.dom); return -1; } if (other) {