From: Peter Krempa <pkre...@redhat.com>
The function can extract it from @vm.
Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_snapshot.c | 5 ++---
src/qemu/qemu_snapshot.h | 3 +--
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index fe969ca3d3..fa1615ceba 100644
--- 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 546545dd01..6d43c2415c 100644
--- 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 b66b83e230..db5ba1eece 100644
--- 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 f38c2acfb3..2e5c3b5423 100644
--- 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,
--
2.49.0
