From patchwork Tue Dec 20 11:05:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 132399 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 296B4B703A for ; Tue, 20 Dec 2011 22:05:45 +1100 (EST) Received: from localhost ([::1]:54219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcxVs-000056-2f for incoming@patchwork.ozlabs.org; Tue, 20 Dec 2011 06:05:40 -0500 Received: from eggs.gnu.org ([140.186.70.92]:49865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcxVh-0008WD-PU for qemu-devel@nongnu.org; Tue, 20 Dec 2011 06:05:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RcxVb-0004YQ-LU for qemu-devel@nongnu.org; Tue, 20 Dec 2011 06:05:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcxVb-0004YD-Ey; Tue, 20 Dec 2011 06:05:23 -0500 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 pBKB5LOZ013357 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Dec 2011 06:05:21 -0500 Received: from garlic.tlv.redhat.com (dhcp-4-31.tlv.redhat.com [10.35.4.31]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pBKB5IrC028432; Tue, 20 Dec 2011 06:05:19 -0500 From: Alon Levy To: kraxel@redhat.com Date: Tue, 20 Dec 2011 13:05:18 +0200 Message-Id: <1324379118-2570-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] qemu-options.hx: fix tls-channel help text X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Signed-off-by: Alon Levy Acked-by: Gerd Hoffmann --- 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