From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 28 Nov 2019 14:01:14 +0000 (+0100)
Subject: qemu: snapshot: Fold formatting of snapshot transaction into prepare func
X-Git-Tag: v6.0.0-rc1~320
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19464852079b34691740b24459cd33f7042f4559;p=thirdparty%2Flibvirt.git

qemu: snapshot: Fold formatting of snapshot transaction into prepare func

qemuDomainSnapshotDiskPrepareOne is already called for each disk which
is member of the snapshot so we don't need to iterate through the
snapshot list again to generate members of the 'transaction' command for
each snapshot.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0a4a2471c7..aa920c1edd 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15344,7 +15344,8 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver,
                                  virHashTablePtr blockNamedNodeData,
                                  bool reuse,
                                  bool blockdev,
-                                 qemuDomainAsyncJob asyncJob)
+                                 qemuDomainAsyncJob asyncJob,
+                                 virJSONValuePtr actions)
 {
     virDomainDiskDefPtr persistdisk;
     bool supportsCreate;
@@ -15417,10 +15418,17 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver,
 
     dd->prepared = true;
 
-    if (blockdev &&
-        qemuDomainSnapshotDiskPrepareOneBlockdev(driver, vm, dd, cfg, reuse,
-                                                 blockNamedNodeData, asyncJob) < 0)
-        return -1;
+    if (blockdev) {
+        if (qemuDomainSnapshotDiskPrepareOneBlockdev(driver, vm, dd, cfg, reuse,
+                                                     blockNamedNodeData, asyncJob) < 0)
+            return -1;
+
+        if (qemuBlockSnapshotAddBlockdev(actions, dd->disk, dd->src) < 0)
+            return -1;
+    } else {
+        if (qemuBlockSnapshotAddLegacy(actions, dd->disk, dd->src, reuse) < 0)
+            return -1;
+    }
 
     return 0;
 }
@@ -15442,7 +15450,8 @@ qemuDomainSnapshotDiskPrepare(virQEMUDriverPtr driver,
                               virHashTablePtr blockNamedNodeData,
                               qemuDomainAsyncJob asyncJob,
                               qemuDomainSnapshotDiskDataPtr *rdata,
-                              size_t *rndata)
+                              size_t *rndata,
+                              virJSONValuePtr actions)
 {
     size_t i;
     qemuDomainSnapshotDiskDataPtr data;
@@ -15462,7 +15471,8 @@ qemuDomainSnapshotDiskPrepare(virQEMUDriverPtr driver,
                                              data + ndata++,
                                              blockNamedNodeData,
                                              reuse, blockdev,
-                                             asyncJob) < 0)
+                                             asyncJob,
+                                             actions) < 0)
             goto cleanup;
     }
 
@@ -15575,7 +15585,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
      * have to roll back later */
     if (qemuDomainSnapshotDiskPrepare(driver, vm, snap, cfg, reuse, blockdev,
                                       blockNamedNodeData, asyncJob,
-                                      &diskdata, &ndiskdata) < 0)
+                                      &diskdata, &ndiskdata, actions) < 0)
         goto cleanup;
 
     /* check whether there's anything to do */
@@ -15584,25 +15594,6 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
         goto cleanup;
     }
 
-     /* Based on earlier qemuDomainSnapshotPrepare, all disks in this list are
-      * now either VIR_DOMAIN_SNAPSHOT_LOCATION_NONE, or
-      * VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL with a valid file name and
-      * qcow2 format.  */
-    for (i = 0; i < ndiskdata; i++) {
-        if (blockdev) {
-            if (qemuBlockSnapshotAddBlockdev(actions,
-                                             diskdata[i].disk,
-                                             diskdata[i].src) < 0)
-                goto cleanup;
-        } else {
-            if (qemuBlockSnapshotAddLegacy(actions,
-                                           diskdata[i].disk,
-                                           diskdata[i].src,
-                                           reuse) < 0)
-                goto cleanup;
-        }
-    }
-
     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
         goto cleanup;