[libvirt PATCH 11/20] qemu_snapshot: extract external snapshot delete prepare to function

Pavel Hrdina posted 20 patches 1 year, 4 months ago
There is a newer version of this series
[libvirt PATCH 11/20] qemu_snapshot: extract external snapshot delete prepare to function
Posted by Pavel Hrdina 1 year, 4 months ago
This part of code is about to grow to make deletion work when use
reverts to non-leaf snapshot.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 src/qemu/qemu_snapshot.c | 89 +++++++++++++++++++++++++---------------
 1 file changed, 55 insertions(+), 34 deletions(-)

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 64730dcb0b..d545c984ce 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -2557,6 +2557,58 @@ qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm,
 }
 
 
+static int
+qemuSnapshotDeleteExternalPrepare(virDomainObj *vm,
+                                  virDomainMomentObj *snap,
+                                  unsigned int flags,
+                                  GSList **externalData,
+                                  bool *stop_qemu)
+{
+    virQEMUDriver *driver = ((qemuDomainObjPrivate *) vm->privateData)->driver;
+    g_autoslist(qemuSnapshotDeleteExternalData) tmpData = NULL;
+
+    if (!virDomainSnapshotIsExternal(snap))
+        return 0;
+
+    if (flags & (VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN |
+                 VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) {
+        return 0;
+    }
+
+    /* this also serves as validation whether the snapshot can be deleted */
+    if (qemuSnapshotDeleteExternalPrepareData(vm, snap, &tmpData) < 0)
+        return -1;
+
+    if (!virDomainObjIsActive(vm)) {
+        if (qemuProcessStart(NULL, driver, vm, NULL, VIR_ASYNC_JOB_SNAPSHOT,
+                             NULL, -1, NULL, NULL,
+                             VIR_NETDEV_VPORT_PROFILE_OP_CREATE,
+                             VIR_QEMU_PROCESS_START_PAUSED) < 0) {
+            return -1;
+        }
+
+        *stop_qemu = true;
+
+        /* Call the prepare again as some data require that the VM is
+         * running to get everything we need. */
+        if (qemuSnapshotDeleteExternalPrepareData(vm, snap, externalData) < 0)
+            return -1;
+    } else {
+        qemuDomainJobPrivate *jobPriv = vm->job->privateData;
+
+        *externalData = g_steal_pointer(&tmpData);
+
+        /* If the VM is running we need to indicate that the async snapshot
+         * job is snapshot delete job. */
+        jobPriv->snapshotDelete = true;
+
+        qemuDomainSaveStatus(vm);
+    }
+
+    return 0;
+}
+
+
 typedef struct _virQEMUMomentReparent virQEMUMomentReparent;
 struct _virQEMUMomentReparent {
     const char *dir;
@@ -3327,40 +3379,9 @@ qemuSnapshotDelete(virDomainObj *vm,
         if (qemuSnapshotDeleteValidate(vm, snap, flags) < 0)
             goto endjob;
 
-        if (virDomainSnapshotIsExternal(snap) &&
-            !(flags & (VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN |
-                       VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY))) {
-            g_autoslist(qemuSnapshotDeleteExternalData) tmpData = NULL;
-
-            /* this also serves as validation whether the snapshot can be deleted */
-            if (qemuSnapshotDeleteExternalPrepareData(vm, snap, &tmpData) < 0)
-                goto endjob;
-
-            if (!virDomainObjIsActive(vm)) {
-                if (qemuProcessStart(NULL, driver, vm, NULL, VIR_ASYNC_JOB_SNAPSHOT,
-                                     NULL, -1, NULL, NULL,
-                                     VIR_NETDEV_VPORT_PROFILE_OP_CREATE,
-                                     VIR_QEMU_PROCESS_START_PAUSED) < 0) {
-                    goto endjob;
-                }
-
-                stop_qemu = true;
-
-                /* Call the prepare again as some data require that the VM is
-                 * running to get everything we need. */
-                if (qemuSnapshotDeleteExternalPrepareData(vm, snap, &externalData) < 0)
-                    goto endjob;
-            } else {
-                qemuDomainJobPrivate *jobPriv = vm->job->privateData;
-
-                externalData = g_steal_pointer(&tmpData);
-
-                /* If the VM is running we need to indicate that the async snapshot
-                 * job is snapshot delete job. */
-                jobPriv->snapshotDelete = true;
-
-                qemuDomainSaveStatus(vm);
-            }
+        if (qemuSnapshotDeleteExternalPrepare(vm, snap, flags,
+                                              &externalData, &stop_qemu) < 0) {
+            goto endjob;
         }
     }
 
-- 
2.39.2
Re: [libvirt PATCH 11/20] qemu_snapshot: extract external snapshot delete prepare to function
Posted by Peter Krempa 1 year, 3 months ago
On Mon, Mar 13, 2023 at 16:42:12 +0100, Pavel Hrdina wrote:
> This part of code is about to grow to make deletion work when use
> reverts to non-leaf snapshot.
> 
> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
> ---
>  src/qemu/qemu_snapshot.c | 89 +++++++++++++++++++++++++---------------
>  1 file changed, 55 insertions(+), 34 deletions(-)

Reviewed-by: Peter Krempa <pkrempa@redhat.com>