From 11e61489ff6a7e03ed47629c6561228e5d4c09bb Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 12 Oct 2020 13:25:25 +0200 Subject: [PATCH] vmx: shortcut 'cdrom-image' as CD-ROM earlier Add it to the list of 'deviceType' values ignored for disks. Signed-off-by: Pino Toscano Reviewed-by: Michal Privoznik --- src/vmx/vmx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 70f4d78e8a..0ec6222f50 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -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")) {