From patchwork Mon Jun 24 06:39:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 253637 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 9D32F2C0500 for ; Mon, 24 Jun 2013 16:40:43 +1000 (EST) Received: from localhost ([::1]:48186 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0S9-0004Sd-Ep for incoming@patchwork.ozlabs.org; Mon, 24 Jun 2013 02:40:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0RY-0004Es-71 for qemu-devel@nongnu.org; Mon, 24 Jun 2013 02:40:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ur0RU-0006yV-2f for qemu-devel@nongnu.org; Mon, 24 Jun 2013 02:40:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0RT-0006xw-S0; Mon, 24 Jun 2013 02:40:00 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5O6dxcL002223 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 24 Jun 2013 02:39:59 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-31.ams2.redhat.com [10.36.116.31]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r5O6dwVw002279; Mon, 24 Jun 2013 02:39:58 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 0A19541781; Mon, 24 Jun 2013 08:39:57 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 24 Jun 2013 08:39:50 +0200 Message-Id: <1372055996-4072-8-git-send-email-kraxel@redhat.com> In-Reply-To: <1372055996-4072-1-git-send-email-kraxel@redhat.com> References: <1372055996-4072-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-trivial@nongnu.org, Markus Armbruster , Gerd Hoffmann , Luiz Capitulino Subject: [Qemu-devel] [PATCH v2 07/13] 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 Signed-off-by: Gerd Hoffmann --- qapi-schema.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index a80ee40..a29ce57 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3185,10 +3185,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 ##