conf: Drop pointless 'domain' argument from virDomainSnapshotRedefinePrep

'vm' is passed in which contains the definition which contains the UUID
so we don't need another parameter for this.

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

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 61c807a71f162a684da028fd1364fe6bd674708e..96ad8ca953c3f4879ff04269f84ba2683f40e6f1 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -986,8 +986,7 @@ virDomainSnapshotIsExternal(virDomainMomentObjPtr snap)
 }
 
 int
-virDomainSnapshotRedefinePrep(virDomainPtr domain,
-                              virDomainObjPtr vm,
+virDomainSnapshotRedefinePrep(virDomainObjPtr vm,
                               virDomainSnapshotDefPtr *defptr,
                               virDomainMomentObjPtr *snap,
                               virDomainXMLOptionPtr xmlopt,
@@ -1006,7 +1005,7 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain,
     if (other)
         otherdef = virDomainSnapshotObjGetDef(other);
     check_if_stolen = other && otherdef->parent.dom;
-    if (virDomainSnapshotRedefineValidate(def, domain->uuid, other, xmlopt,
+    if (virDomainSnapshotRedefineValidate(def, 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)

diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h
index 216726fc16a4989c4449b77f442fcd733a80413d..17d614a7e12119639aa2880b18016f3bad6c616a 100644 (file)
--- a/src/conf/snapshot_conf.h
+++ b/src/conf/snapshot_conf.h
@@ -129,8 +129,7 @@ int virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr snapshot,
 bool virDomainSnapshotDefIsExternal(virDomainSnapshotDefPtr def);
 bool virDomainSnapshotIsExternal(virDomainMomentObjPtr snap);
 
-int virDomainSnapshotRedefinePrep(virDomainPtr domain,
-                                  virDomainObjPtr vm,
+int virDomainSnapshotRedefinePrep(virDomainObjPtr vm,
                                   virDomainSnapshotDefPtr *def,
                                   virDomainMomentObjPtr *snap,
                                   virDomainXMLOptionPtr xmlopt,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 09bfda1503e7a4fbe88e1006b1b69417fb775f68..4ff592b30d5b57143d67dc7fb4d0c9d9e0b248b7 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15969,7 +15969,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
     qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_NONE);
 
     if (redefine) {
-        if (virDomainSnapshotRedefinePrep(domain, vm, &def, &snap,
+        if (virDomainSnapshotRedefinePrep(vm, &def, &snap,
                                           driver->xmlopt,
                                           &update_current, flags) < 0)
             goto endjob;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index dafd8c8daa51a8e4fce287cac0803b91cf62cbf6..19b8158ed65c123449c963cba862e57647956c9b 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -8612,7 +8612,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain,
         goto cleanup;
 
     if (redefine) {
-        if (virDomainSnapshotRedefinePrep(domain, vm, &def, &snap,
+        if (virDomainSnapshotRedefinePrep(vm, &def, &snap,
                                           privconn->xmlopt,
                                           &update_current, flags) < 0)
             goto cleanup;