qemu_snapshot: rework snapshot children deletion

This simplifies the code a bit by reusing existing parts that deletes
a single snapshot.

The drawback of this change is that we will now call the re-parent bits
to keep the metadata in sync for every child even though it will get
deleted as well.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index e65eef8a0de26c64aeeb36422f9b705f17d53753..37a52028a5559247dfb020f0d5a6074e1555a024 100644 (file)
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -2311,6 +2311,31 @@ qemuSnapshotDeleteSingle(virDomainObj *vm,
 }
 
 
+struct qemuSnapshotDeleteAllData {
+    virDomainObj *vm;
+    bool metadata_only;
+    int error;
+};
+
+
+static int
+qemuSnapshotDeleteAllHelper(void *payload,
+                            const char *name G_GNUC_UNUSED,
+                            void *opaque)
+{
+    int error;
+    virDomainMomentObj *snap = payload;
+    struct qemuSnapshotDeleteAllData *data = opaque;
+
+    error = qemuSnapshotDeleteSingle(data->vm, snap, data->metadata_only);
+
+    if (error != 0)
+        data->error = error;
+
+    return 0;
+}
+
+
 /**
  * qemuSnapshotDeleteChildren:
  * @vm: domain object
@@ -2331,44 +2356,22 @@ qemuSnapshotDeleteChildren(virDomainObj *vm,
                            bool metadata_only,
                            bool children_only)
 {
-    virQEMUMomentRemove rem;
-    qemuDomainObjPrivate *priv = vm->privateData;
-    virQEMUDriver *driver = priv->driver;
-    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+    struct qemuSnapshotDeleteAllData data = {
+        .vm = vm,
+        .metadata_only = metadata_only,
+    };
 
-    rem.driver = driver;
-    rem.vm = vm;
-    rem.metadata_only = metadata_only;
-    rem.err = 0;
-    rem.current = virDomainSnapshotGetCurrent(vm->snapshots);
-    rem.found = false;
-    rem.momentDiscard = qemuDomainSnapshotDiscard;
-    virDomainMomentForEachDescendant(snap, qemuDomainMomentDiscardAll,
-                                     &rem);
-    if (rem.err < 0)
-        return -1;
-    if (rem.found) {
-        qemuSnapshotSetCurrent(vm, snap);
+    virDomainMomentForEachDescendant(snap, qemuSnapshotDeleteAllHelper, &data);
 
-        if (children_only) {
-            if (qemuDomainSnapshotWriteMetadata(vm, snap,
-                                                driver->xmlopt,
-                                                cfg->snapshotDir) < 0) {
-                virReportError(VIR_ERR_INTERNAL_ERROR,
-                               _("failed to set snapshot '%s' as current"),
-                               snap->def->name);
-                virDomainSnapshotSetCurrent(vm->snapshots, NULL);
-                return -1;
-            }
-        }
-    }
+    if (data.error < 0)
+        return -1;
 
-    if (children_only) {
-        virDomainMomentDropChildren(snap);
-        return 0;
+    if (!children_only &&
+        qemuSnapshotDeleteSingle(vm, snap, metadata_only) < 0) {
+        return -1;
     }
 
-    return qemuDomainSnapshotDiscard(driver, vm, snap, true, metadata_only);
+    return 0;
 }