From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=54509 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q2lMx-00066H-7g for qemu-devel@nongnu.org; Thu, 24 Mar 2011 10:18:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q2lMw-0002jQ-5O for qemu-devel@nongnu.org; Thu, 24 Mar 2011 10:18:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64675) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q2lMv-0002jF-Rh for qemu-devel@nongnu.org; Thu, 24 Mar 2011 10:18:34 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2OEIW4Y019716 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Mar 2011 10:18:32 -0400 Received: from playa.tlv.redhat.com (dhcp-3-110.tlv.redhat.com [10.35.3.110]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p2OEIVBn014720 for ; Thu, 24 Mar 2011 10:18:32 -0400 From: Alon Levy Date: Thu, 24 Mar 2011 16:17:56 +0200 Message-Id: <1300976276-5364-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCH] qemu-options.hx: fix spice tls-channel List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --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=][,x509-dir=]\n" " [,x509-key-file=][,x509-cert-file=]\n" " [,x509-dh-key-file=][,tls-ciphers=]\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= 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). -- 1.7.4.1