From 815182a78260a4f14a9f1e950b30ab62c632e8d6 Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 1 Dec 2021 14:09:10 +0100
Subject: [PATCH] qemu_snapshot: revert: move saving metadata to separate
 function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_snapshot.c | 58 +++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 1d4af221e2..8ad441e41a 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -1997,6 +1997,40 @@ qemuSnapshotRevertPrep(virDomainMomentObj *snap,
 }
 
 
+static int
+qemuSnapshotRevertWriteMetadata(virDomainObj *vm,
+                                virDomainMomentObj *snap,
+                                virQEMUDriver *driver,
+                                virQEMUDriverConfig *cfg,
+                                bool defined)
+{
+    qemuSnapshotSetCurrent(vm, snap);
+    if (qemuDomainSnapshotWriteMetadata(vm, snap,
+                                        driver->xmlopt,
+                                        cfg->snapshotDir) < 0) {
+        virDomainSnapshotSetCurrent(vm->snapshots, NULL);
+        return -1;
+    }
+
+    if (defined && vm->persistent) {
+        int detail;
+        virObjectEvent *event = NULL;
+        virDomainDef *saveDef = vm->newDef ? vm->newDef : vm->def;
+
+        if (virDomainDefSave(saveDef, driver->xmlopt, cfg->configDir) < 0)
+            return -1;
+
+        detail = VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT;
+        event = virDomainEventLifecycleNewFromObj(vm,
+                                                  VIR_DOMAIN_EVENT_DEFINED,
+                                                  detail);
+        virObjectEventStateQueue(driver->domainEventState, event);
+    }
+
+    return 0;
+}
+
+
 /* The domain is expected to be locked and inactive. */
 static int
 qemuSnapshotRevertInactive(virQEMUDriver *driver,
@@ -2247,28 +2281,8 @@ qemuSnapshotRevert(virDomainObj *vm,
  endjob:
     qemuProcessEndJob(driver, vm);
 
-    if (ret == 0) {
-        qemuSnapshotSetCurrent(vm, snap);
-        if (qemuDomainSnapshotWriteMetadata(vm, snap,
-                                            driver->xmlopt,
-                                            cfg->snapshotDir) < 0) {
-            virDomainSnapshotSetCurrent(vm->snapshots, NULL);
-            ret = -1;
-        }
-    }
-    if (ret == 0 && defined && vm->persistent) {
-        virDomainDef *saveDef = vm->newDef ? vm->newDef : vm->def;
-
-        ret = virDomainDefSave(saveDef, driver->xmlopt, cfg->configDir);
-
-        if (ret == 0) {
-            detail = VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT;
-            event = virDomainEventLifecycleNewFromObj(vm,
-                                             VIR_DOMAIN_EVENT_DEFINED,
-                                             detail);
-            virObjectEventStateQueue(driver->domainEventState, event);
-        }
-    }
+    if (ret == 0)
+        ret = qemuSnapshotRevertWriteMetadata(vm, snap, driver, cfg, defined);
 
     return ret;
 }