diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-06 12:51:21 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-06 12:51:21 -0600 |
| commit | a2e4d53ec5cc1983a615d87b251726f17358be9a (patch) | |
| tree | a371a8cbff80eaebdcd30aa5d0148cde2e35fdfd /qemu-options.hx | |
| parent | 2afee49fc4a366ab740899ec9e79079ec335e0fb (diff) | |
| parent | dc10e8b3c556b582eb7919c92d0997b5f9a9d136 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
qemu-nbd: drop loop which can never loop
Make python mandatory
net/socket.c: Fix fd leak in net_socket_listen_init() error paths
gdbstub: Fix fd leak in gdbserver_open() error path
configure: Fix test for supported host CPU type
configure: CONFIG_QEMU_INTERP_PREFIX only for user mode
scsi virtio-blk usb-msd: Clean up device init error messages
Strip trailing '\n' from error_report()'s first argument (again)
qemu-options.hx: fix tls-channel help text
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index b38e672fdb..7903e5c11b 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -871,8 +871,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 |