[PATCHv1.5 8/8] qemu: snapshot: Use storage driver to pre-create snapshot file

[Peter Krempa <pkrempa@xxxxxxxxxx>]

Move the last operation done on local files to the storage driver API.
---
 src/qemu/qemu_driver.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c0e6485..f0cf1c6 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12855,7 +12855,6 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
     char *source = NULL;
     const char *formatStr = NULL;
     int ret = -1;
-    int fd = -1;
     bool need_unlink = false;

     if (snap->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) {
@@ -12873,7 +12872,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
     if (virStorageSourceInitChainElement(newDiskSrc, disk->src, false) < 0)
         goto cleanup;

-    if (virStorageFileInit(newDiskSrc) < 0)
+    if (qemuDomainStorageFileInit(driver, vm, newDiskSrc) < 0)
         goto cleanup;

     if (qemuGetDriveSourceString(newDiskSrc, NULL, &source) < 0)
@@ -12889,15 +12888,13 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
     }

     /* pre-create the image file so that we can label it before handing it to qemu */
-    /* XXX we should switch to storage driver based pre-creation of the image */
-    if (virStorageSourceIsLocalStorage(newDiskSrc)) {
-        if (!reuse && newDiskSrc->type != VIR_STORAGE_TYPE_BLOCK) {
-            fd = qemuOpenFile(driver, vm, source, O_WRONLY | O_TRUNC | O_CREAT,
-                              &need_unlink, NULL);
-            if (fd < 0)
-                goto cleanup;
-            VIR_FORCE_CLOSE(fd);
+    if (!reuse && newDiskSrc->type != VIR_STORAGE_TYPE_BLOCK) {
+        if (virStorageFileCreate(newDiskSrc) < 0) {
+            virReportSystemError(errno, _("failed to create image file '%s'"),
+                                 source);
+            goto cleanup;
         }
+        need_unlink = true;
     }

     /* set correct security, cgroup and locking options on the new image */
-- 
2.0.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list