From: Martin Kletzander <mkletzan@redhat.com>
Date: Tue, 5 Jan 2021 12:58:53 +0000 (+0100)
Subject: esx: Handle missing images in esxParseVMXFileName
X-Git-Tag: v7.0.0-rc1~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e6c13148749ce3f61980f922e6901d7b5557cfb;p=thirdparty%2Flibvirt.git

esx: Handle missing images in esxParseVMXFileName

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index dde51688f7..0271f81a56 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -129,7 +129,7 @@ static int
 esxParseVMXFileName(const char *fileName,
                     void *opaque,
                     char **out,
-                    bool allow_missing G_GNUC_UNUSED)
+                    bool allow_missing)
 {
     esxVMX_Data *data = opaque;
     esxVI_String *propertyNameList = NULL;
@@ -223,9 +223,13 @@ esxParseVMXFileName(const char *fileName,
         }
 
         if (!datastoreList) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("File name '%s' refers to non-existing datastore '%s'"),
-                           fileName, datastoreName);
+            if (allow_missing) {
+                ret = 0;
+            } else {
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("File name '%s' refers to non-existing datastore '%s'"),
+                               fileName, datastoreName);
+            }
             goto cleanup;
         }