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

vmx: shortcut 'cdrom-image' as CD-ROM earlier

Browse Source 
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>
This commit is contained in:
Pino Toscano 2020-10-12 13:25:25 +02:00
parent b23ee6394a
commit 11e61489ff
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vmx/vmx.c
View 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")) {