From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 18 Oct 2024 14:13:15 +0000 (+0200)
Subject: qemu: snapshot: Delete leftover overlay files for <transient/> disks
X-Git-Tag: v10.9.0-rc1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36080e1b57026c7e1a580278966d2dee3e56bebf;p=thirdparty%2Flibvirt.git

qemu: snapshot: Delete leftover overlay files for <transient/> disks

When a VM is terminated by host reboot libvirt doesn't get to cleaning
out the temporary overlay file used for transient disks. Since we create
those files with a very specific suffix it's almost guaranteed that if
it exists it's a leftover from a libvirt run. Delete them instead of
complaining to preserve functionality.

Closes: https://gitlab.com/libvirt/libvirt/-/issues/684
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 1187ebf276..795522da21 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -1287,10 +1287,12 @@ qemuSnapshotGetTransientDiskDef(virDomainDiskDef *domdisk,
                                           domdisk->src->path, suffix);
 
     if (virFileExists(snapdisk->src->path)) {
-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
-                       _("Overlay file '%1$s' for transient disk '%2$s' already exists"),
-                       snapdisk->src->path, domdisk->dst);
-        return NULL;
+        if (unlink(snapdisk->src->path) != 0) {
+            virReportSystemError(errno,
+                                 _("Failed to delete overlay file '%1$s' for transient disk '%2$s'"),
+                                 snapdisk->src->path, domdisk->dst);
+            return NULL;
+        }
     }
 
     return g_steal_pointer(&snapdisk);