diff mbox

qemu-options.hx: fix spice tls-channel

Message ID 1300976276-5364-1-git-send-email-alevy@redhat.com
State New
Headers show

Commit Message

Alon Levy March 24, 2011, 2:17 p.m. UTC 
missing cursor and smartcard channels, and missing a note about
tunnel and smartcard channels not always being available.
---
 qemu-options.hx |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/qemu-options.hx b/qemu-options.hx
index 540f5c2..ebd98af 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -695,7 +695,7 @@  DEF("spice", HAS_ARG, QEMU_OPTION_spice,
 "                [,disable-ticketing][,tls-port=<nr>][,x509-dir=<dir>]\n"
 "                [,x509-key-file=<file>][,x509-cert-file=<file>]\n"
 "                [,x509-dh-key-file=<file>][,tls-ciphers=<list>]\n"
-"                [,tls-channel=main|display|inputs|record|playback|tunnel]\n"
+"                [,tls-channel=main|display|cursor|inputs|record|playback|tunnel|smartcard]\n"
 "                [,image-compression=auto_glz|auto_lz|quic|glz|lz|off]\n"
 "                [,jpeg-wan-compression=auto|never|always]\n"
 "                [,streaming-video=off|all|filter]\n"
@@ -743,13 +743,15 @@  The x509 file names can also be configured individually.
 @item tls-ciphers=<list>
 Specify which ciphers to use.
 
-@item tls-channel=[main|display|inputs|record|playback|tunnel]
-@item plaintext-channel=[main|display|inputs|record|playback|tunnel]
+@item tls-channel=[main|display|cursor|inputs|record|playback|tunnel|smartcard]
+@item plaintext-channel=[main|display|cursor|inputs|record|playback|tunnel|smartcard]
 Force specific channel to be used with or without TLS encryption.  The
 options can be specified multiple times to configure multiple
 channels.  The special name "default" can be used to set the default
 mode.  For channels which are not explicitly forced into one mode the
 spice client is allowed to pick tls/plaintext as he pleases.
+Note: tunnel and smartcard are compile time options for the underlying spice
+server library, they may not exist in your distribution's default package.
 
 @item image-compression=[auto_glz|auto_lz|quic|glz|lz|off]
 Configure image compression (lossless).