From nobody Mon Feb 9 01:20:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571385069; cv=none; d=zoho.com; s=zohoarc; b=GdHp4o/mZdvimqO7thfXYoEJT22cvGs8K1s4NMt4iMm8+ZQpKC7YMMPCetwzRoAhHC39ygdgxdN1a7rPeGiNp6nCHr8PfvTqxU4ADNyjCG4d+foSNx/MLLNtfGZQKMqOXY8/LYMgy1GjEXUbeP+hHUN2Nk5qZNklN+aiLlhjW5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571385069; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7D+ipagFQfC2K3jGB0yNaPrFAJsHug6EVR2quRmkxhc=; b=SBEsjgwT/o26A/24WPCvfZ3yd2B9PIks2kIZZT+y1d7xnQGlHBtQs5u71AgopDXSBsnjQUURYTPpwyfUhNGy5tH3YrCnl2Sm0mEgzkvbrPjgBnLp2q96k7dO4bT4EwJrSkfbnvuS1jNw2tHfEsL18SKiP1slLwFZqYk3Aaoymcs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571385069786112.79504185018277; Fri, 18 Oct 2019 00:51:09 -0700 (PDT) Received: from localhost ([::1]:36064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLN2S-0007Ho-B4 for importer@patchew.org; Fri, 18 Oct 2019 03:51:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59500) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLMvP-0000RS-ME for qemu-devel@nongnu.org; Fri, 18 Oct 2019 03:43:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLMvO-0007fH-KI for qemu-devel@nongnu.org; Fri, 18 Oct 2019 03:43:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5281) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLMvO-0007et-EU for qemu-devel@nongnu.org; Fri, 18 Oct 2019 03:43:50 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9EFC4307B190; Fri, 18 Oct 2019 07:43:49 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.118.123]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0F32B5D9CC; Fri, 18 Oct 2019 07:43:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 81DEE11384A8; Fri, 18 Oct 2019 09:43:45 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 1/7] qapi: Don't suppress doc generation without pragma doc-required Date: Fri, 18 Oct 2019 09:43:39 +0200 Message-Id: <20191018074345.24034-2-armbru@redhat.com> In-Reply-To: <20191018074345.24034-1-armbru@redhat.com> References: <20191018074345.24034-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 18 Oct 2019 07:43:49 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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: kwolf@redhat.com, marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Commit bc52d03ff5 "qapi: Make doc comments optional where we don't need them" made scripts/qapi2texi.py fail[*] unless the schema had pragma 'doc-required': true. The stated reason was inability to cope with incomplete documentation. When commit fb0bc835e5 "qapi-gen: New common driver for code and doc generators" folded scripts/qapi2texi.py into scripts/qapi-gen.py, it turned the failure into silent suppression. The doc generator can cope with incomplete documentation now. I don't know since when, or what the problem was, or even whether it ever existed. Drop the silent suppression. [*] The fail part was broken, fixed in commit e8ba07ea9a. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/qapi/doc.py | 2 -- tests/Makefile.include | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/qapi/doc.py b/scripts/qapi/doc.py index 5fc0fc7e06..693cc4486b 100755 --- a/scripts/qapi/doc.py +++ b/scripts/qapi/doc.py @@ -283,8 +283,6 @@ class QAPISchemaGenDocVisitor(qapi.common.QAPISchemaVis= itor): =20 =20 def gen_doc(schema, output_dir, prefix): - if not qapi.common.doc_required: - return vis =3D QAPISchemaGenDocVisitor(prefix) vis.visit_begin(schema) for doc in schema.docs: diff --git a/tests/Makefile.include b/tests/Makefile.include index 3543451ed3..214fbd941c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -609,6 +609,7 @@ tests/test-qapi-gen-timestamp: \ $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \ -o tests -p "test-" $<, \ "GEN","$(@:%-timestamp=3D%)") + @rm -f tests/test-qapi-doc.texi @>$@ =20 tests/qapi-schema/doc-good.test.texi: $(SRC_PATH)/tests/qapi-schema/doc-go= od.json $(qapi-py) --=20 2.21.0