From patchwork Fri Jun 28 18:17:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 255524 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 21FBF2C0098 for ; Sat, 29 Jun 2013 04:43:52 +1000 (EST) Received: from localhost ([::1]:60738 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsdI6-0004wm-T9 for incoming@patchwork.ozlabs.org; Fri, 28 Jun 2013 14:21:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsdHQ-0004kK-1a for qemu-devel@nongnu.org; Fri, 28 Jun 2013 14:20:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsdHO-0006Gp-5Y for qemu-devel@nongnu.org; Fri, 28 Jun 2013 14:20:19 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:56877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsdHN-0006GR-Uf; Fri, 28 Jun 2013 14:20:18 -0400 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 5C34742BCE; Fri, 28 Jun 2013 22:20:17 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 410CB56D; Fri, 28 Jun 2013 22:17:48 +0400 (MSK) From: Michael Tokarev To: Anthony Liguori Date: Fri, 28 Jun 2013 22:17:38 +0400 Message-Id: <1372443465-22384-8-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1372443465-22384-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1372443465-22384-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Michael Tokarev , Gerd Hoffmann , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 07/14] qemu-char: fix documentation for telnet+wait socket flags 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 From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Reviewed-by: Laszlo Ersek Signed-off-by: Michael Tokarev --- qapi-schema.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 6590307..5c32528 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3288,10 +3288,11 @@ # @addr: socket address to listen on (server=true) # or connect to (server=false) # @server: #optional create server socket (default: true) -# @wait: #optional wait for connect (not used for server -# sockets, default: false) +# @wait: #optional wait for incoming connection on server +# sockets (default: false). # @nodelay: #optional set TCP_NODELAY socket option (default: false) -# @telnet: #optional enable telnet protocol (default: false) +# @telnet: #optional enable telnet protocol on server +# sockets (default: false) # # Since: 1.4 ##