qemuSnapshotDiscardAllMetadata: Remove 'driver' argument

The function can extract it from @vm.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index fe969ca3d3eb968e19f5a4e56b625d4a2ec956b2..fa1615cebaf0b75b085b83ef8784d73d607fe382 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5797,7 +5797,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriver *driver,
     g_autofree char *chkDir = NULL;
 
     /* Remove any snapshot metadata prior to removing the domain */
-    if (qemuSnapshotDiscardAllMetadata(driver, vm) < 0) {
+    if (qemuSnapshotDiscardAllMetadata(vm) < 0) {
         VIR_WARN("unable to remove all snapshots for domain %s",
                  vm->def->name);
     } else {

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 546545dd0186f988328816a5f6e1e768ce30b047..6d43c2415c713d8fb7b568acb4f8a3dbc1032406 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6587,7 +6587,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
                            nsnapshots);
             goto endjob;
         }
-        if (qemuSnapshotDiscardAllMetadata(driver, vm) < 0)
+        if (qemuSnapshotDiscardAllMetadata(vm) < 0)
             goto endjob;
     }
     if (!virDomainObjIsActive(vm) &&

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index b66b83e230815429174e071eeb912c0786ccf295..db5ba1eece7a547d5fd811ce0746aac8a0f3bee6 100644 (file)
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -4135,11 +4135,10 @@ qemuSnapshotDiscard(virQEMUDriver *driver G_GNUC_UNUSED,
 
 
 int
-qemuSnapshotDiscardAllMetadata(virQEMUDriver *driver,
-                               virDomainObj *vm)
+qemuSnapshotDiscardAllMetadata(virDomainObj *vm)
 {
     virQEMUMomentRemove rem = {
-        .driver = driver,
+        .driver = QEMU_DOMAIN_PRIVATE(vm)->driver,
         .vm = vm,
         .metadata_only = true,
         .momentDiscard = qemuSnapshotDiscard,

diff --git a/src/qemu/qemu_snapshot.h b/src/qemu/qemu_snapshot.h
index f38c2acfb3a7a536fe985970a08284d3731a38a4..2e5c3b54238dbd86c295f6e9ae1cdd9c0c5cd3e3 100644 (file)
--- a/src/qemu/qemu_snapshot.h
+++ b/src/qemu/qemu_snapshot.h
@@ -50,8 +50,7 @@ qemuSnapshotRevert(virDomainObj *vm,
                    unsigned int flags);
 
 int
-qemuSnapshotDiscardAllMetadata(virQEMUDriver *driver,
-                               virDomainObj *vm);
+qemuSnapshotDiscardAllMetadata(virDomainObj *vm);
 
 int
 qemuSnapshotDelete(virDomainObj *vm,