qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: Anthony Liguori <aliguori@us.ibm.com>,
	Alon Levy <alevy@redhat.com>,
	Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 1/9] qemu-options.hx: fix tls-channel help text
Date: Fri,  6 Jan 2012 15:51:20 +0000	[thread overview]
Message-ID: <1325865088-23897-2-git-send-email-stefanha@linux.vnet.ibm.com> (raw)
In-Reply-To: <1325865088-23897-1-git-send-email-stefanha@linux.vnet.ibm.com>

From: Alon Levy <alevy@redhat.com>

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 <kraxel@redhat.com>
Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 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=<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]
+@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

  reply	other threads:[~2012-01-06 15:53 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-06 15:51 [Qemu-devel] [PULL 0/9] Trivial patches for 20 December 2011 to 6 January 2012 Stefan Hajnoczi
2012-01-06 15:51 ` Stefan Hajnoczi [this message]
2012-01-06 15:51 ` [Qemu-devel] [PATCH 2/9] Strip trailing '\n' from error_report()'s first argument (again) Stefan Hajnoczi
2012-01-06 15:51 ` [Qemu-devel] [PATCH 3/9] scsi virtio-blk usb-msd: Clean up device init error messages Stefan Hajnoczi
2012-01-06 15:51 ` [Qemu-devel] [PATCH 4/9] configure: CONFIG_QEMU_INTERP_PREFIX only for user mode Stefan Hajnoczi
2012-01-06 15:51 ` [Qemu-devel] [PATCH 5/9] configure: Fix test for supported host CPU type Stefan Hajnoczi
2012-01-06 15:51 ` [Qemu-devel] [PATCH 6/9] gdbstub: Fix fd leak in gdbserver_open() error path Stefan Hajnoczi
2012-01-06 15:51 ` [Qemu-devel] [PATCH 7/9] net/socket.c: Fix fd leak in net_socket_listen_init() error paths Stefan Hajnoczi
2012-01-06 15:51 ` [Qemu-devel] [PATCH 8/9] Make python mandatory Stefan Hajnoczi
2012-01-06 15:51 ` [Qemu-devel] [PATCH 9/9] qemu-nbd: drop loop which can never loop Stefan Hajnoczi
2012-01-09 14:51 ` [Qemu-devel] [PULL 0/9] Trivial patches for 20 December 2011 to 6 January 2012 Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1325865088-23897-2-git-send-email-stefanha@linux.vnet.ibm.com \
    --to=stefanha@linux.vnet.ibm.com \
    --cc=alevy@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).