Revision f15a6b03 lib/hypervisor/hv_kvm.py
b/lib/hypervisor/hv_kvm.py | ||
---|---|---|
678 | 678 |
constants.HV_KVM_SPICE_TLS_CIPHERS: hv_base.NO_CHECK, |
679 | 679 |
constants.HV_KVM_SPICE_USE_VDAGENT: hv_base.NO_CHECK, |
680 | 680 |
constants.HV_KVM_FLOPPY_IMAGE_PATH: hv_base.OPT_FILE_CHECK, |
681 |
constants.HV_CDROM_IMAGE_PATH: hv_base.OPT_FILE_CHECK, |
|
681 |
constants.HV_CDROM_IMAGE_PATH: hv_base.OPT_FILE_OR_URL_CHECK,
|
|
682 | 682 |
constants.HV_KVM_CDROM2_IMAGE_PATH: hv_base.OPT_FILE_CHECK, |
683 | 683 |
constants.HV_BOOT_ORDER: |
684 | 684 |
hv_base.ParamInSet(True, constants.HT_KVM_VALID_BO_TYPES), |
... | ... | |
1426 | 1426 |
|
1427 | 1427 |
iso_image = hvp[constants.HV_CDROM_IMAGE_PATH] |
1428 | 1428 |
if iso_image: |
1429 |
options = ",format=raw,media=cdrom" |
|
1429 |
options = ",media=cdrom" |
|
1430 |
if not re.match(r'(https?|ftps?)://', iso_image): |
|
1431 |
options = "%s,format=raw" % options |
|
1430 | 1432 |
# set cdrom 'if' type |
1431 | 1433 |
if boot_cdrom: |
1432 | 1434 |
actual_cdrom_type = constants.HT_DISK_IDE |
Also available in: Unified diff