[libvirt] [PATCH] qemu: don't call virFileExists() for network type disks

Martin Kletzander mkletzan at redhat.com
Tue Apr 29 07:41:47 UTC 2014


Based on suggestion from Eric [1], because it might not get cleaned up
before the release, so to avoid potential errors.

[1] https://www.redhat.com/archives/libvir-list/2014-April/msg00929.html

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 src/qemu/qemu_domain.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index ab19738..f412f49 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2270,6 +2270,7 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver,
         disk = vm->def->disks[i - 1];
         const char *path = virDomainDiskGetSource(disk);
         enum virStorageFileFormat format = virDomainDiskGetFormat(disk);
+        enum virStorageType type = virDomainDiskGetType(disk);

         if (!path)
             continue;
@@ -2277,7 +2278,8 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver,
         /* There is no need to check the backing chain for disks
          * without backing support, the fact that the file exists is
          * more than enough */
-        if (format >= VIR_STORAGE_FILE_NONE &&
+        if (type != VIR_STORAGE_TYPE_NETWORK &&
+            format >= VIR_STORAGE_FILE_NONE &&
             format < VIR_STORAGE_FILE_BACKING &&
             virFileExists(path))
             continue;
-- 
1.9.2




More information about the libvir-list mailing list