From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 12 Aug 2019 13:11:36 +0000 (+0200)
Subject: qemu: Disband qemuDomainSnapshotCreateSingleDiskActive
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fd8e55ca93c0f70c2a57e4a9e8304acf07b03cad;p=libvirt.git

qemu: Disband qemuDomainSnapshotCreateSingleDiskActive

After we always assume support for the 'transaction' command
(c358adc57113b) and follow-up cleanups
qemuDomainSnapshotCreateSingleDiskActive lost its value. Move the code
into appropriate helpers and remove the function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ddd1410203..9d5bd638c9 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15361,6 +15361,22 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver,
         }
     }
 
+    /* pre-create the image file so that we can label it before handing it to qemu */
+    if (!reuse && dd->src->type != VIR_STORAGE_TYPE_BLOCK) {
+        if (virStorageFileCreate(dd->src) < 0) {
+            virReportSystemError(errno, _("failed to create image file '%s'"),
+                                 NULLSTR(dd->src->path));
+            return -1;
+        }
+        dd->created = true;
+    }
+
+    /* set correct security, cgroup and locking options on the new image */
+    if (qemuDomainStorageSourceAccessAllow(driver, vm, dd->src, false, true) < 0)
+        return -1;
+
+    dd->prepared = true;
+
     return 0;
 }
 
@@ -15463,36 +15479,6 @@ qemuDomainSnapshotDiskUpdateSource(virQEMUDriverPtr driver,
 }
 
 
-static int
-qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
-                                         virDomainObjPtr vm,
-                                         qemuDomainSnapshotDiskDataPtr dd,
-                                         virJSONValuePtr actions,
-                                         bool reuse)
-{
-    if (qemuBlockSnapshotAddLegacy(actions, dd->disk, dd->src, reuse) < 0)
-        return -1;
-
-    /* pre-create the image file so that we can label it before handing it to qemu */
-    if (!reuse && dd->src->type != VIR_STORAGE_TYPE_BLOCK) {
-        if (virStorageFileCreate(dd->src) < 0) {
-            virReportSystemError(errno, _("failed to create image file '%s'"),
-                                 NULLSTR(dd->src->path));
-            return -1;
-        }
-        dd->created = true;
-    }
-
-    /* set correct security, cgroup and locking options on the new image */
-    if (qemuDomainStorageSourceAccessAllow(driver, vm, dd->src, false, true) < 0)
-        return -1;
-
-    dd->prepared = true;
-
-    return 0;
-}
-
-
 /* The domain is expected to be locked and active. */
 static int
 qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
@@ -15534,9 +15520,10 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
       * VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL with a valid file name and
       * qcow2 format.  */
     for (i = 0; i < ndiskdata; i++) {
-        if (qemuDomainSnapshotCreateSingleDiskActive(driver, vm,
-                                                     &diskdata[i],
-                                                     actions, reuse) < 0)
+        if (qemuBlockSnapshotAddLegacy(actions,
+                                       diskdata[i].disk,
+                                       diskdata[i].src,
+                                       reuse) < 0)
             goto cleanup;
     }