Revision bfe86c76 lib/hypervisor/hv_kvm.py
| b/lib/hypervisor/hv_kvm.py | ||
|---|---|---|
| 432 | 432 |
hv_base.ParamInSet(False, |
| 433 | 433 |
constants.HT_KVM_SPICE_VALID_VIDEO_STREAM_DETECTION_OPTIONS), |
| 434 | 434 |
constants.HV_KVM_SPICE_AUDIO_COMPR: hv_base.NO_CHECK, |
| 435 |
constants.HV_KVM_SPICE_USE_TLS: hv_base.NO_CHECK, |
|
| 435 | 436 |
constants.HV_KVM_FLOPPY_IMAGE_PATH: hv_base.OPT_FILE_CHECK, |
| 436 | 437 |
constants.HV_CDROM_IMAGE_PATH: hv_base.OPT_FILE_CHECK, |
| 437 | 438 |
constants.HV_KVM_CDROM2_IMAGE_PATH: hv_base.OPT_FILE_CHECK, |
| ... | ... | |
| 1030 | 1031 |
# ValidateParameters checked it. |
| 1031 | 1032 |
spice_address = spice_bind |
| 1032 | 1033 |
|
| 1033 |
spice_arg = "addr=%s,port=%s" % (spice_address, instance.network_port) |
|
| 1034 |
spice_arg = "addr=%s" % spice_address |
|
| 1035 |
if hvp[constants.HV_KVM_SPICE_USE_TLS]: |
|
| 1036 |
spice_arg = "%s,tls-port=%s,x509-cacert-file=%s" % (spice_arg, |
|
| 1037 |
instance.network_port, constants.SPICE_CACERT_FILE) |
|
| 1038 |
spice_arg = "%s,x509-key-file=%s,x509-cert-file=%s" % (spice_arg, |
|
| 1039 |
constants.SPICE_CERT_FILE, constants.SPICE_CERT_FILE) |
|
| 1040 |
else: |
|
| 1041 |
spice_arg = "%s,port=%s" % (spice_arg, instance.network_port) |
|
| 1042 |
|
|
| 1034 | 1043 |
if not hvp[constants.HV_KVM_SPICE_PASSWORD_FILE]: |
| 1035 | 1044 |
spice_arg = "%s,disable-ticketing" % spice_arg |
| 1036 | 1045 |
|
| ... | ... | |
| 1651 | 1660 |
constants.HV_KVM_SPICE_JPEG_IMG_COMPR, |
| 1652 | 1661 |
constants.HV_KVM_SPICE_ZLIB_GLZ_IMG_COMPR, |
| 1653 | 1662 |
constants.HV_KVM_SPICE_STREAMING_VIDEO_DETECTION, |
| 1663 |
constants.HV_KVM_SPICE_USE_TLS, |
|
| 1654 | 1664 |
]) |
| 1655 | 1665 |
for param in spice_additional_params: |
| 1656 | 1666 |
if hvparams[param]: |
Also available in: Unified diff