|
 |
218e99 |
From e93fe39c1553da8bc81a08e4ab31698a24395a51 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
218e99 |
Date: Mon, 14 Oct 2013 13:35:16 +0200
|
|
|
218e99 |
Subject: [PATCH 09/18] qemu-char: fix documentation for telnet+wait socket flags
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
218e99 |
Message-id: <1381757723-23134-9-git-send-email-kraxel@redhat.com>
|
|
|
218e99 |
Patchwork-id: 54854
|
|
|
218e99 |
O-Subject: [RHEL-7 qemu-kvm PATCH 08/15] qemu-char: fix documentation for telnet+wait socket flags
|
|
|
218e99 |
Bugzilla: 922010
|
|
|
218e99 |
RH-Acked-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
218e99 |
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
|
218e99 |
(cherry picked from commit ef993ba7bc631b57f9ea70a7f6fc8c0fcbdfa19d)
|
|
|
218e99 |
---
|
|
|
218e99 |
qapi-schema.json | 7 ++++---
|
|
|
218e99 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
qapi-schema.json | 7 ++++---
|
|
|
218e99 |
1 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/qapi-schema.json b/qapi-schema.json
|
|
|
218e99 |
index ffe0ed1..780c6fe 100644
|
|
|
218e99 |
--- a/qapi-schema.json
|
|
|
218e99 |
+++ b/qapi-schema.json
|
|
|
218e99 |
@@ -3213,10 +3213,11 @@
|
|
|
218e99 |
# @addr: socket address to listen on (server=true)
|
|
|
218e99 |
# or connect to (server=false)
|
|
|
218e99 |
# @server: #optional create server socket (default: true)
|
|
|
218e99 |
-# @wait: #optional wait for connect (not used for server
|
|
|
218e99 |
-# sockets, default: false)
|
|
|
218e99 |
+# @wait: #optional wait for incoming connection on server
|
|
|
218e99 |
+# sockets (default: false).
|
|
|
218e99 |
# @nodelay: #optional set TCP_NODELAY socket option (default: false)
|
|
|
218e99 |
-# @telnet: #optional enable telnet protocol (default: false)
|
|
|
218e99 |
+# @telnet: #optional enable telnet protocol on server
|
|
|
218e99 |
+# sockets (default: false)
|
|
|
218e99 |
#
|
|
|
218e99 |
# Since: 1.4
|
|
|
218e99 |
##
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|