From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rdfw7-00033o-Go for qemu-devel@nongnu.org; Thu, 22 Dec 2011 05:31:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rdfw2-0000m1-CM for qemu-devel@nongnu.org; Thu, 22 Dec 2011 05:31:43 -0500 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:58726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rdfw2-0000lP-4m for qemu-devel@nongnu.org; Thu, 22 Dec 2011 05:31:38 -0500 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 22 Dec 2011 10:31:37 -0000 Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pBMAVXpL2580672 for ; Thu, 22 Dec 2011 10:31:33 GMT Received: from d06av04.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pBMAVWn3018727 for ; Thu, 22 Dec 2011 03:31:32 -0700 From: Stefan Hajnoczi Date: Thu, 22 Dec 2011 10:31:28 +0000 Message-Id: <1324549890-22255-2-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1324549890-22255-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1324549890-22255-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 1/3] 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