From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 12 Jan 2022 15:15:19 +0000 (+0100)
Subject: qemuSnapshotRedefine: Rename 'def' to 'snapdef'
X-Git-Tag: v8.0.0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56f4ec311ff973d70132998e1052ef76a5be7b2b;p=thirdparty%2Flibvirt.git

qemuSnapshotRedefine: Rename 'def' to 'snapdef'

'def' is commonly used to refer to domain definition. Most of the
snapshot code uses 'snapdef' for the snapshot definition.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 5d383279b0..624ace0314 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -1709,7 +1709,7 @@ qemuSnapshotCreateWriteMetadata(virDomainObj *vm,
 static virDomainSnapshotPtr
 qemuSnapshotRedefine(virDomainObj *vm,
                      virDomainPtr domain,
-                     virDomainSnapshotDef *def,
+                     virDomainSnapshotDef *snapdef,
                      virQEMUDriver *driver,
                      virQEMUDriverConfig *cfg,
                      unsigned int flags)
@@ -1717,13 +1717,13 @@ qemuSnapshotRedefine(virDomainObj *vm,
     virDomainMomentObj *snap = NULL;
     virDomainSnapshotPtr ret = NULL;
 
-    if (virDomainSnapshotRedefinePrep(vm, &def, &snap,
+    if (virDomainSnapshotRedefinePrep(vm, &snapdef, &snap,
                                       driver->xmlopt,
                                       flags) < 0)
         return NULL;
 
     if (!snap) {
-        if (!(snap = virDomainSnapshotAssignDef(vm->snapshots, def)))
+        if (!(snap = virDomainSnapshotAssignDef(vm->snapshots, snapdef)))
             return NULL;
     }
     /* XXX Should we validate that the redefined snapshot even