]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
vmx: shortcut 'cdrom-image' as CD-ROM earlier
authorPino Toscano <ptoscano@redhat.com>
Mon, 12 Oct 2020 11:25:25 +0000 (13:25 +0200)
committerPino Toscano <ptoscano@redhat.com>
Wed, 14 Oct 2020 09:23:24 +0000 (11:23 +0200)
Add it to the list of 'deviceType' values ignored for disks.

Signed-off-by: Pino Toscano <ptoscano@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/vmx/vmx.c

index 70f4d78e8a6cda4412b086d7a68e2abf11c8d85c..0ec6222f50a996454788e31c39e684b330126404 100644 (file)
@@ -2235,13 +2235,15 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
             (deviceType &&
              (STRCASEEQ(deviceType, "atapi-cdrom") ||
               STRCASEEQ(deviceType, "cdrom-raw") ||
+              STRCASEEQ(deviceType, "cdrom-image") ||
               (STRCASEEQ(deviceType, "scsi-passthru") &&
                STRPREFIX(fileName, "/vmfs/devices/cdrom/"))))) {
             /*
              * This function was called in order to parse a harddisk device,
-             * but .iso files, 'atapi-cdrom', 'cdrom-raw', and 'scsi-passthru'
-             * CDROM devices are for CDROM devices only. Just ignore it, another
-             * call to this function to parse a CDROM device may handle it.
+             * but .iso files, 'atapi-cdrom', 'cdrom-raw', 'cdrom-image',
+             * and 'scsi-passthru' CDROM devices are for CDROM devices only.
+             * Just ignore it, another call to this function to parse a CDROM
+             * device may handle it.
              */
             goto ignore;
         } else if (virStringHasCaseSuffix(fileName, ".vmdk")) {