[PATCH 10/17] qemuCheckpointDiscardAllMetadata: Remove 'driver' argument
From: Peter Krempa <pkrempa(a)redhat.com>
The function can extract it from @vm.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_checkpoint.c | 5 ++---
src/qemu/qemu_checkpoint.h | 3 +--
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
index cf44e45aa1..af847cf1f2 100644
--- 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 fc1c35cdd2..2c72213598 100644
--- 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 235bfd65cb..fe969ca3d3 100644
--- 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 a34d6f1437..546545dd01 100644
--- 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;
}
--
2.49.0