Revision 3e40b587

b/lib/constants.py
687 687
HV_KVM_SPICE_STREAMING_VIDEO_DETECTION = "spice_streaming_video"
688 688
HV_KVM_SPICE_AUDIO_COMPR = "spice_playback_compression"
689 689
HV_KVM_SPICE_USE_TLS = "spice_use_tls"
690
HV_KVM_SPICE_TLS_CIPHERS = "spice_tls_ciphers"
691
HV_KVM_SPICE_USE_VDAGENT = "spice_use_vdagent"
690 692
HV_ACPI = "acpi"
691 693
HV_PAE = "pae"
692 694
HV_USE_BOOTLOADER = "use_bootloader"
......
739 741
  HV_KVM_SPICE_STREAMING_VIDEO_DETECTION: VTYPE_STRING,
740 742
  HV_KVM_SPICE_AUDIO_COMPR: VTYPE_BOOL,
741 743
  HV_KVM_SPICE_USE_TLS: VTYPE_BOOL,
744
  HV_KVM_SPICE_TLS_CIPHERS: VTYPE_STRING,
745
  HV_KVM_SPICE_USE_VDAGENT: VTYPE_BOOL,
742 746
  HV_ACPI: VTYPE_BOOL,
743 747
  HV_PAE: VTYPE_BOOL,
744 748
  HV_USE_BOOTLOADER: VTYPE_BOOL,
......
1365 1369
    HV_KVM_SPICE_STREAMING_VIDEO_DETECTION: "",
1366 1370
    HV_KVM_SPICE_AUDIO_COMPR: True,
1367 1371
    HV_KVM_SPICE_USE_TLS: False,
1372
    HV_KVM_SPICE_TLS_CIPHERS: OPENSSL_CIPHERS,
1373
    HV_KVM_SPICE_USE_VDAGENT: True,
1368 1374
    HV_KVM_FLOPPY_IMAGE_PATH: "",
1369 1375
    HV_CDROM_IMAGE_PATH: "",
1370 1376
    HV_KVM_CDROM2_IMAGE_PATH: "",
b/lib/hypervisor/hv_kvm.py
433 433
        constants.HT_KVM_SPICE_VALID_VIDEO_STREAM_DETECTION_OPTIONS),
434 434
    constants.HV_KVM_SPICE_AUDIO_COMPR: hv_base.NO_CHECK,
435 435
    constants.HV_KVM_SPICE_USE_TLS: hv_base.NO_CHECK,
436
    constants.HV_KVM_SPICE_TLS_CIPHERS: hv_base.NO_CHECK,
437
    constants.HV_KVM_SPICE_USE_VDAGENT: hv_base.NO_CHECK,
436 438
    constants.HV_KVM_FLOPPY_IMAGE_PATH: hv_base.OPT_FILE_CHECK,
437 439
    constants.HV_CDROM_IMAGE_PATH: hv_base.OPT_FILE_CHECK,
438 440
    constants.HV_KVM_CDROM2_IMAGE_PATH: hv_base.OPT_FILE_CHECK,
......
1037 1039
            instance.network_port, constants.SPICE_CACERT_FILE)
1038 1040
        spice_arg = "%s,x509-key-file=%s,x509-cert-file=%s" % (spice_arg,
1039 1041
            constants.SPICE_CERT_FILE, constants.SPICE_CERT_FILE)
1042
        tls_ciphers = hvp[constants.HV_KVM_SPICE_TLS_CIPHERS]
1043
        if tls_ciphers:
1044
          spice_arg = "%s,tls-ciphers=%s" % (spice_arg, tls_ciphers)
1040 1045
      else:
1041 1046
        spice_arg = "%s,port=%s" % (spice_arg, instance.network_port)
1042 1047

  
......
1065 1070
      # Audio compression, by default in qemu-kvm it is on
1066 1071
      if not hvp[constants.HV_KVM_SPICE_AUDIO_COMPR]:
1067 1072
        spice_arg = "%s,playback-compression=off" % spice_arg
1073
      if not hvp[constants.HV_KVM_SPICE_USE_VDAGENT]:
1074
        spice_arg = "%s,agent-mouse=off" % spice_arg
1068 1075

  
1069 1076
      logging.info("KVM: SPICE will listen on port %s", instance.network_port)
1070 1077
      kvm_cmd.extend(["-spice", spice_arg])
b/man/gnt-instance.rst
359 359
    Specifies that the SPICE server must use TLS to encrypt all the
360 360
    traffic with the client.
361 361

  
362
spice\_tls\_ciphers
363
    Valid for the KVM hypervisor.
364

  
365
    Specifies a list of comma-separated ciphers that SPICE should use
366
    for TLS connections. For the format, see man cipher(1).
367

  
368
spice\_use\_vdagent
369
    Valid for the KVM hypervisor.
370

  
371
    Enables or disables passing mouse events via SPICE vdagent.
372

  
362 373
acpi
363 374
    Valid for the Xen HVM and KVM hypervisors.
364 375

  

Also available in: Unified diff