From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 29 Sep 2021 16:53:52 +0000 (+0200)
Subject: qemu_snapshot: create: move virDomainSnapshotAssignDef to both code paths
X-Git-Tag: v8.0.0-rc1~461
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe52bc2638eebaaebcdae4c6d64c8125fd98736d;p=thirdparty%2Flibvirt.git

qemu_snapshot: create: move virDomainSnapshotAssignDef to both code paths

This makes it obvious that the function is called for creating new
snapshot and redefining old snapshot as well.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 6c09ab375e..abcee30116 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -1760,15 +1760,18 @@ qemuSnapshotCreateXML(virDomainPtr domain,
                                           driver->xmlopt,
                                           flags) < 0)
             goto endjob;
+
+        if (!snap) {
+            if (!(snap = virDomainSnapshotAssignDef(vm->snapshots, def)))
+                goto endjob;
+        }
     } else {
         if (qemuSnapshotCreateAlignDisks(vm, def, driver, flags) < 0)
             goto endjob;
 
         if (qemuSnapshotPrepare(vm, def, &flags) < 0)
             goto endjob;
-    }
 
-    if (!snap) {
         if (!(snap = virDomainSnapshotAssignDef(vm->snapshots, def)))
             goto endjob;