qemuCheckpointDiscardAllMetadata: 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_checkpoint.c b/src/qemu/qemu_checkpoint.c
index cf44e45aa1846d273385c13d74e659689c4be541..af847cf1f20618b9c64e0f456dcc893a9ef623b6 100644 (file)
--- a/src/qemu/qemu_checkpoint.c
+++ b/src/qemu/qemu_checkpoint.c
@@ -305,11 +305,10 @@ qemuCheckpointDiscard(virQEMUDriver *driver,
 
 
 int
-qemuCheckpointDiscardAllMetadata(virQEMUDriver *driver,
-                                       virDomainObj *vm)
+qemuCheckpointDiscardAllMetadata(virDomainObj *vm)
 {
     virQEMUMomentRemove rem = {
-        .driver = driver,
+        .driver = QEMU_DOMAIN_PRIVATE(vm)->driver,
         .vm = vm,
         .metadata_only = true,
         .momentDiscard = qemuCheckpointDiscard,

diff --git a/src/qemu/qemu_checkpoint.h b/src/qemu/qemu_checkpoint.h
index fc1c35cdd2550450eb9508fad751adfe120daa21..2c72213598764c50567a059f3f7665605a64e89d 100644 (file)
--- a/src/qemu/qemu_checkpoint.h
+++ b/src/qemu/qemu_checkpoint.h
@@ -33,8 +33,7 @@ qemuCheckpointObjFromName(virDomainObj *vm,
                           const char *name);
 
 int
-qemuCheckpointDiscardAllMetadata(virQEMUDriver *driver,
-                                 virDomainObj *vm);
+qemuCheckpointDiscardAllMetadata(virDomainObj *vm);
 
 virDomainCheckpointPtr
 qemuCheckpointCreateXML(virDomainPtr domain,

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 235bfd65cba8eeb085162a907587e3cfabe3ffc0..fe969ca3d3eb968e19f5a4e56b625d4a2ec956b2 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5807,7 +5807,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriver *driver,
             VIR_WARN("unable to remove snapshot directory %s", snapDir);
     }
     /* Remove any checkpoint metadata prior to removing the domain */
-    if (qemuCheckpointDiscardAllMetadata(driver, vm) < 0) {
+    if (qemuCheckpointDiscardAllMetadata(vm) < 0) {
         VIR_WARN("unable to remove all checkpoints for domain %s",
                  vm->def->name);
     } else {

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a34d6f14370cb6efc258d135c951dc27ce786dc1..546545dd0186f988328816a5f6e1e768ce30b047 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6599,7 +6599,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
                            ncheckpoints);
             goto endjob;
         }
-        if (qemuCheckpointDiscardAllMetadata(driver, vm) < 0)
+        if (qemuCheckpointDiscardAllMetadata(vm) < 0)
             goto endjob;
     }