From patchwork Tue Sep 8 06:54:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 249270 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4293225ilg; Mon, 7 Sep 2020 23:54:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1eRIrHcCOK2OB0A0DxXeU49o4ytdn/TGW1AzYNjhDX2PxO9GkD4kHRd1eKIBEJOpPO2Nq X-Received: by 2002:a25:2d48:: with SMTP id s8mr33868162ybe.8.1599548095861; Mon, 07 Sep 2020 23:54:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599548095; cv=none; d=google.com; s=arc-20160816; b=pa3NDdtolyt1O+/Oqc5nVotz0kdqMNFckCFFcHkS6K9alv33kI4b4WD9r63ayRIpkQ oc/jUDCcq5Otdh6VmypDJUKvLaIHMlq9UsMMpKmmm/aBbg2y4nKYC08sz0lvHbZ8lEMa 8254l1xkYyA0nXm3a03xpZLlHKbjbE9HXCRUjWElCYJoNS5BBge4+ISbzjlJqsmWLT61 gqOEXZhnAKLJhJor8Ntajkao5z2ZQSEvsRp6gyu669K1Sip5D29bLi7koPyWCcSt3fLE xrmk5txIJ1mm2UzFR1b9069LgHBR75dPI6+xkTU5HN4ZOViWkkQDJwKznwSqiK01pa+T YNFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=SsuVsisdCqSRS5dGwtcYAumiBH2SK0i4xd2ofrCECVY=; b=DhTV4jHgCwLNhxWPA03OF+UbbrheSJXCvFSigixnVu/mNxvmJ+vy5FhFlJgRSbS41O 5X9WWRSJ/alNYaxMJUpgKpBzcOdyBBtfSbY2OH4UYG9ENoeow6XD7Q3AdCeoCZP6CX7Y zAhj0lvRqN4muV/Rv04XLUDHa1Q0/sML6zdTH0YxnMS1kdgZSMDtHNbt7r1SzHRJKjNO vgwZtl+qRNeVdLUDaJNAojbcbuGJ+1rvROL0xTRp1G98GudFZSANruM1Irw1P3OHUl+f j+MFJzuDcrP5V7Uu6luU9Gro/pItfICwf9mWB7KAE+d8wLTS3xBUpSaK2OQW9i//GsZ9 echw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EHs1kNFR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a5si16392785ybp.156.2020.09.07.23.54.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Sep 2020 23:54:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EHs1kNFR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:35934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFXWp-0001JT-Ac for patch@linaro.org; Tue, 08 Sep 2020 02:54:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFXWN-0001GX-HJ for qemu-devel@nongnu.org; Tue, 08 Sep 2020 02:54:27 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:36556 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kFXWL-0008D1-NJ for qemu-devel@nongnu.org; Tue, 08 Sep 2020 02:54:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599548065; 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: in-reply-to:in-reply-to:references:references; bh=SsuVsisdCqSRS5dGwtcYAumiBH2SK0i4xd2ofrCECVY=; b=EHs1kNFRopo9Q/L8TO5YT35v6GS/Qhg6MKdQZOSjGJFDk3jejf0nPtkNI58c1cnu/KpRhz ZcBEzH+sZZGbS0TWn8ecxUU+mCXrbrCpzDp47WUEQ2JYvkL9uypf536/w0fIpSXKnDC0lN P9bHQgceqs1lni4ebP6ybIn+02elqiE= 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-13-lF6k6v7WOzucyHueMSaE6w-1; Tue, 08 Sep 2020 02:54:22 -0400 X-MC-Unique: lF6k6v7WOzucyHueMSaE6w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7CD841084D70; Tue, 8 Sep 2020 06:54:21 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-68.ams2.redhat.com [10.36.113.68]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4AE097E30C; Tue, 8 Sep 2020 06:54:21 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9587F112CDE9; Tue, 8 Sep 2020 08:54:17 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 5/5] qapi/block-core.json: Fix nbd-server-start docs Date: Tue, 8 Sep 2020 08:54:17 +0200 Message-Id: <20200908065417.3158250-6-armbru@redhat.com> In-Reply-To: <20200908065417.3158250-1-armbru@redhat.com> References: <20200908065417.3158250-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/08 00:33:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: peter.maydell@linaro.org, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Commit eed8b6917832 added some new text to the nbd-server-start documentation in the wrong place. Since this is after the 'Returns:' line it's parsed as if it were part of the documentation of the "Returns:' information. Move it up to join the rest of the "documentation of the type as a whole" doc text. This doesn't look odd in the current HTML rendering, but the new QAPI-to-rST handling will complain about the indent level of the lines not matching up with the 'Returns:' line. Signed-off-by: Peter Maydell Message-Id: <20200810195019.25427-4-peter.maydell@linaro.org> Reviewed-by: Richard Henderson Signed-off-by: Markus Armbruster --- qapi/block-core.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.26.2 diff --git a/qapi/block-core.json b/qapi/block-core.json index 091f826f53..c5ac22d246 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -5211,6 +5211,9 @@ # server will present them as named exports; for example, another # QEMU instance could refer to them as "nbd:HOST:PORT:exportname=NAME". # +# 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 @@ -5221,9 +5224,6 @@ # # 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. -# # Since: 1.3.0 ## { 'command': 'nbd-server-start',