From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjC6V-00057x-2c for qemu-devel@nongnu.org; Fri, 06 Jan 2012 10:53:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RjC6T-0006Z5-IO for qemu-devel@nongnu.org; Fri, 06 Jan 2012 10:53:15 -0500 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:54829) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjC6T-0006Ym-6F for qemu-devel@nongnu.org; Fri, 06 Jan 2012 10:53:13 -0500 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 6 Jan 2012 15:53:12 -0000 Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q06FqgJG2019576 for ; Fri, 6 Jan 2012 15:52:43 GMT Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q06Fqgdi004474 for ; Fri, 6 Jan 2012 08:52:42 -0700 From: Stefan Hajnoczi Date: Fri, 6 Jan 2012 15:51:20 +0000 Message-Id: <1325865088-23897-2-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1325865088-23897-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1325865088-23897-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 1/9] qemu-options.hx: fix tls-channel help text List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Alon Levy , Stefan Hajnoczi From: Alon Levy Remove the default compiled out tunnel channel, add the always available cursor channel. Optimally the man page would depend on compiled in options, but that's harder to do. RHBZ: 688586 Acked-by: Gerd Hoffmann Signed-off-by: Alon Levy Signed-off-by: Stefan Hajnoczi --- qemu-options.hx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index a60191f..3c3bda8 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -857,8 +857,8 @@ 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] +@item plaintext-channel=[main|display|cursor|inputs|record|playback] 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 -- 1.7.7.3