From nobody Tue Feb 10 01:14:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684337135; cv=none; d=zohomail.com; s=zohoarc; b=j5LaFCOlhaLm/WpBpgd5jMizALUzwrMNjJ1Ihfag2QiZ7q0k78DPTc4pg8GyTADTaFKDTDHGc1g1N7RHArsZ2MNMpR2UarveO9xIRtynhTWoFRnTZSnEIEHULhhtu662hhTeJwrJODmlE4tUT26qzxDQP1ycMMxH2+8aO+Ff8N4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684337135; h=Content-Type: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=1LSO1onCVfNA6cEtjlz2dvTFAMoLCEFMbsScdLFgDKY=; b=nDCMLYnSuJBfbUWgtbxCM298K4WmbojOohXqMvmc0vtCRahyZR8Fzbz4ECItbRBLaefjra6otmdGTrbRq52FhcItP30bXs8xU/3muvCcmVg58FcmTIT0SsPil+puvfcD/uR7ILFiGUG304ApBXsDS6LrqdKb7g+nmBWLMUPcpxA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16843371358631023.086137851659; Wed, 17 May 2023 08:25:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzJ1p-0004IA-8k; Wed, 17 May 2023 11:25:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzJ1l-0004I1-JM for qemu-devel@nongnu.org; Wed, 17 May 2023 11:25:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzJ1k-0000CW-4U for qemu-devel@nongnu.org; Wed, 17 May 2023 11:25:21 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-445-c4-usGUdPtKiN6HerlrZFQ-1; Wed, 17 May 2023 11:25:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5D1CF3C17A68; Wed, 17 May 2023 15:25:17 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3BD69C16024; Wed, 17 May 2023 15:25:17 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 203C821E669A; Wed, 17 May 2023 17:25:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684337119; 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=1LSO1onCVfNA6cEtjlz2dvTFAMoLCEFMbsScdLFgDKY=; b=PxIMvCvEB2ALie4A43SEgZ4ME8LGOuX70FBLujSutEMvRMTz2MGbwPEtkEunHatSKWeWCB 6vRfawD3HcUFy56rd0WmbAA+HxcXnwsnDsHJBrwD78XxxtOVoqB5/3j3+Pb7wNDAgNP2MA ++zkW0SimAZFRih6mkXPGE/lKDAngYQ= X-MC-Unique: c4-usGUdPtKiN6HerlrZFQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Juan Quintela Subject: [PULL 1/5] qapi: Improve error message for description following section Date: Wed, 17 May 2023 17:25:11 +0200 Message-Id: <20230517152516.1884640-2-armbru@redhat.com> In-Reply-To: <20230517152516.1884640-1-armbru@redhat.com> References: <20230517152516.1884640-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684337136170100001 Content-Type: text/plain; charset="utf-8" The error message is bad when the section is untagged. For instance, test case doc-interleaved-section produces "'@foobar:' can't follow 'Note' section", which is okay, but if we drop the "Note:" tag, we get "'@foobar:' can't follow 'None' section, which is bad. Change the error message to "description of '@foobar:' follows a section". Signed-off-by: Markus Armbruster Message-Id: <20230510141637.3685080-1-armbru@redhat.com> Reviewed-by: Juan Quintela [Conflict with commit 3e32dca3f0d resolved] --- scripts/qapi/parser.py | 4 ++-- tests/qapi-schema/doc-interleaved-section.err | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index 4923a59d60..acd43cd7e1 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -675,8 +675,8 @@ def _append_various_line(self, line: str) -> None: match =3D self._match_at_name_colon(line) if match: raise QAPIParseError(self._parser, - "'@%s:' can't follow '%s' section" - % (match.group(1), self.sections[0].name)) + "description of '@%s:' follows a section" + % match.group(1)) match =3D self._match_section_tag(line) if match: line =3D line[match.end():] diff --git a/tests/qapi-schema/doc-interleaved-section.err b/tests/qapi-sch= ema/doc-interleaved-section.err index 715d58cd31..e5d1ef54c1 100644 --- a/tests/qapi-schema/doc-interleaved-section.err +++ b/tests/qapi-schema/doc-interleaved-section.err @@ -1 +1 @@ -doc-interleaved-section.json:15:1: '@foobar:' can't follow 'Note' section +doc-interleaved-section.json:15:1: description of '@foobar:' follows a sec= tion --=20 2.39.2