External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuDomainBuildNamespace: Try harder to remove temp directories

Browse Source 
If building namespace fails somewhere in the middle (that is some
files exists under devMountsSavePath[i]), then plain rmdir() is
not enough to remove dir. Umount the temp location and use
virFileDeleteTree() to remove the directory.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Mores <pmores@redhat.com>
This commit is contained in:
Michal Privoznik 2019-10-04 21:01:29 +02:00
parent 6bc746d66d
commit ca2edd678d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_domain.c
View File

@ -15311,9 +15311,12 @@ qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
ret = 0; ret = 0;
cleanup: cleanup:
for (i = 0; i < ndevMountsPath; i++) { for (i = 0; i < ndevMountsPath; i++) {
#if defined(__linux__)
umount(devMountsSavePath[i]);
#endif /* defined(__linux__) */
/* The path can be either a regular file or a dir. */ /* The path can be either a regular file or a dir. */
if (virFileIsDir(devMountsSavePath[i])) if (virFileIsDir(devMountsSavePath[i]))
rmdir(devMountsSavePath[i]); virFileDeleteTree(devMountsSavePath[i]);
else else
unlink(devMountsSavePath[i]); unlink(devMountsSavePath[i]);
} }