From patchwork Thu Oct 1 13:14:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 11811437 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF9FF6CA for ; Thu, 1 Oct 2020 13:17:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 59EAB206B5 for ; Thu, 1 Oct 2020 13:17:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eEeoFrJG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59EAB206B5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNySC-0008GO-5a for patchwork-qemu-devel@patchwork.kernel.org; Thu, 01 Oct 2020 09:17:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyQB-0007Lz-BB for qemu-devel@nongnu.org; Thu, 01 Oct 2020 09:14:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:36258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNyQ5-0006qX-KQ for qemu-devel@nongnu.org; Thu, 01 Oct 2020 09:14:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601558087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3XbvsUjeKYcUEIboJ+hyeMcCuCcuXyUv198nBwa3Cc4=; b=eEeoFrJGn3fLXaIF6R7LbXsnJRWxLclA5LNZ1Ac/+PkvSNy8uwlPrHBEVvV7DyRU6HwGK2 VW+eBOQdwwX11DVmBQwYFN/OQP1BElx14+kBL64JNZ/us5gla3Jp0nal8BLOPPtD+KHHNS yhxr5mTkFsZWP490Z9d2KX+WpbNJ9+Y= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-512-njZgZPJ1OOGG_0ECpxlrjw-1; Thu, 01 Oct 2020 09:14:46 -0400 X-MC-Unique: njZgZPJ1OOGG_0ECpxlrjw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 342D964093 for ; Thu, 1 Oct 2020 13:14:45 +0000 (UTC) Received: from localhost (ovpn-115-144.ams2.redhat.com [10.36.115.144]) by smtp.corp.redhat.com (Postfix) with ESMTP id D51F45C1D0; Thu, 1 Oct 2020 13:14:40 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH] block/export: fix QAPI doc indentation style violation Date: Thu, 1 Oct 2020 14:14:39 +0100 Message-Id: <20201001131439.386431-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/01 02:15:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Markus Armbruster , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Since commit a69a6d4b4d4fae2e3d2506241e22a78ff1732283 ("scripts/qapi/parser.py: improve doc comment indent handling") the QAPI generator emits an error when unindented text follows "Returns:". Fix block-export.json by moving the comment to make the QAPI generator happy. Signed-off-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daudé --- Based-on: git://repo.or.cz/qemu/kevin.git block qapi/block-export.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/qapi/block-export.json b/qapi/block-export.json index 87ac5117cd..a793e34af9 100644 --- a/qapi/block-export.json +++ b/qapi/block-export.json @@ -39,21 +39,21 @@ # server will present them as named exports; for example, another # QEMU instance could refer to them as "nbd:HOST:PORT:exportname=NAME". # -# @addr: Address on which to listen. -# @tls-creds: ID of the TLS credentials object (since 2.6). -# @tls-authz: ID of the QAuthZ authorization object used to validate -# the client's x509 distinguished name. This object is -# is only resolved at time of use, so can be deleted and -# recreated on the fly while the NBD server is active. -# If missing, it will default to denying access (since 4.0). -# @max-connections: The maximum number of connections to allow at the same -# time, 0 for unlimited. (since 5.2; default: 0) -# -# Returns: error if the server is already running. -# # Keep this type consistent with the NbdServerOptions type. The only intended # difference is using SocketAddressLegacy instead of SocketAddress. # +# @addr: Address on which to listen. +# @tls-creds: ID of the TLS credentials object (since 2.6). +# @tls-authz: ID of the QAuthZ authorization object used to validate +# the client's x509 distinguished name. This object is +# is only resolved at time of use, so can be deleted and +# recreated on the fly while the NBD server is active. +# If missing, it will default to denying access (since 4.0). +# @max-connections: The maximum number of connections to allow at the same +# time, 0 for unlimited. (since 5.2; default: 0) +# +# Returns: error if the server is already running. +# # Since: 1.3.0 ## { 'command': 'nbd-server-start',