* [Qemu-devel] [PATCH] qemu-options.hx: fix tls-channel help text
@ 2011-12-20 11:05 Alon Levy
2011-12-20 14:30 ` Gerd Hoffmann
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Alon Levy @ 2011-12-20 11:05 UTC (permalink / raw)
To: kraxel; +Cc: qemu-trivial, qemu-devel
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 <alevy@redhat.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.8
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] qemu-options.hx: fix tls-channel help text
2011-12-20 11:05 [Qemu-devel] [PATCH] qemu-options.hx: fix tls-channel help text Alon Levy
@ 2011-12-20 14:30 ` Gerd Hoffmann
2011-12-21 10:58 ` Stefan Hajnoczi
2011-12-21 10:59 ` Stefan Hajnoczi
2 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2011-12-20 14:30 UTC (permalink / raw)
To: Alon Levy; +Cc: qemu-trivial, qemu-devel
On 12/20/11 12:05, Alon Levy wrote:
> 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.
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
cheers,
Gerd
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu-options.hx: fix tls-channel help text
2011-12-20 11:05 [Qemu-devel] [PATCH] qemu-options.hx: fix tls-channel help text Alon Levy
2011-12-20 14:30 ` Gerd Hoffmann
@ 2011-12-21 10:58 ` Stefan Hajnoczi
2011-12-21 10:59 ` Stefan Hajnoczi
2 siblings, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2011-12-21 10:58 UTC (permalink / raw)
To: Alon Levy; +Cc: qemu-trivial, kraxel, qemu-devel
On Tue, Dec 20, 2011 at 01:05:18PM +0200, Alon Levy wrote:
> 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 <alevy@redhat.com>
> ---
> qemu-options.hx | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
Looks fine but giving Gerd a chance to review and respond.
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu-options.hx: fix tls-channel help text
2011-12-20 11:05 [Qemu-devel] [PATCH] qemu-options.hx: fix tls-channel help text Alon Levy
2011-12-20 14:30 ` Gerd Hoffmann
2011-12-21 10:58 ` Stefan Hajnoczi
@ 2011-12-21 10:59 ` Stefan Hajnoczi
2 siblings, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2011-12-21 10:59 UTC (permalink / raw)
To: Alon Levy; +Cc: qemu-trivial, kraxel, qemu-devel
On Tue, Dec 20, 2011 at 01:05:18PM +0200, Alon Levy wrote:
> 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 <alevy@redhat.com>
> ---
> qemu-options.hx | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-12-21 10:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-20 11:05 [Qemu-devel] [PATCH] qemu-options.hx: fix tls-channel help text Alon Levy
2011-12-20 14:30 ` Gerd Hoffmann
2011-12-21 10:58 ` Stefan Hajnoczi
2011-12-21 10:59 ` Stefan Hajnoczi
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).