vmx: Treat missing cdrom-image as empty drive

This is perfectly valid in VMWare and the VM just boots with an empty drive.  We
used to just skip the whole drive before, but since we changed how we parse
empty cdrom drives this results in an error.  Make it behave more closer to
VMWare.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1903953

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

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index aa5d1d4eedea1949bc77fa7ff136888eafb279f5..56318fc8b2852e070094ae2b029616c9b154b52d 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -2448,7 +2448,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
             }
 
             virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE);
-            if (ctx->parseFileName(fileName, ctx->opaque, &tmp, false) < 0)
+            if (ctx->parseFileName(fileName, ctx->opaque, &tmp, true) < 0)
                 goto cleanup;
             virDomainDiskSetSource(*def, tmp);
             VIR_FREE(tmp);

diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index d622e46fd5631c24739f4c50d2b178919949b0fc..11739e6f3f51e96b61ba5378c76d58361b39d264 100644 (file)
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -247,8 +247,8 @@ mymain(void)
     DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect");
     DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect");
 
-    DO_TEST_FAIL("cdrom-ide-file-missing-datastore", "cdrom-ide-empty");
-    DO_TEST_FAIL("cdrom-ide-file-missing-file", "cdrom-ide-empty");
+    DO_TEST("cdrom-ide-file-missing-datastore", "cdrom-ide-empty");
+    DO_TEST("cdrom-ide-file-missing-file", "cdrom-ide-empty");
 
     DO_TEST_FAIL("harddisk-ide-file-missing-datastore", "harddisk-ide-file");
     DO_TEST_FAIL("harddisk-scsi-file-missing-file", "harddisk-scsi-file");