From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7F20FCA5FA5 for ; Tue, 29 Sep 2026 15:09:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xBZRf-0000gM-1k; Tue, 29 Sep 2026 11:08:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xBZRZ-0000fz-1X for qemu-devel@nongnu.org; Tue, 29 Sep 2026 11:08:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xBZRX-0005pL-9t for qemu-devel@nongnu.org; Tue, 29 Sep 2026 11:08:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790694510; 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=fQXncmzlfil9Eu1udGh+iBxT4BdrZnbXfg4DBuHukUY=; b=OReZZ7G60v3W2JjWxq/RFdJP7ujVsaktqsIueUQAHxO5fCpYlmSvn+OjG2qgVLTOloRhEu 7FABYlKq17QUrdydADJghPpDofi/Uz3s74+H2dvDSI/h9MM4Pd7fB+A/CDFJY0U5GDmD1G k5euUq3GeSSbi4T60xHR0lkc0bty4Ug= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-222-2KR81CiFPdKe85f5S3QQMQ-1; Tue, 29 Sep 2026 11:08:27 -0400 X-MC-Unique: 2KR81CiFPdKe85f5S3QQMQ-1 X-Mimecast-MFC-AGG-ID: 2KR81CiFPdKe85f5S3QQMQ_1790694503 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5727819540DD; Tue, 29 Sep 2026 15:08:23 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.44.22.5]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 76EAA19560AB; Tue, 29 Sep 2026 15:08:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 14EA321E6A04; Tue, 29 Sep 2026 17:08:20 +0200 (CEST) From: Markus Armbruster To: John Snow Cc: Markus Armbruster , qemu-devel , Peter Xu , Daniel P. =?utf-8?Q?Berrang=C3=A9?= , Stefan Berger , Fabiano Rosas , Hanna Reitz , Paolo Bonzini , Zhao Liu , Kevin Wolf , Ani Sinha , Pierrick Bouvier , Jiri Pirko , Alex Williamson , Kashyap Chamarthy , Peter Maydell , Kostiantyn Kostiuk , Stefan Hajnoczi , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Michael Roth , Mauro Carvalho Chehab , Vladimir Sementsov-Ogievskiy , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Qemu-block , =?utf-8?Q?C=C3=A9dric?= Le Goater , Stefano Garzarella , Richard Henderson , "Michael S. Tsirkin" , Igor Mammedov , Jason Wang , Alex =?utf-8?Q?Benn=C3=A9e?= , Eric Blake Subject: Re: [PATCH 09/14] qapi/parser: remove _insert_after_intro() helper In-Reply-To: (John Snow's message of "Tue, 29 Sep 2026 10:19:45 -0400") References: <20260928223657.2303684-1-jsnow@redhat.com> <20260928223657.2303684-10-jsnow@redhat.com> <87v77ow6et.fsf@pond.sub.org> Date: Tue, 29 Sep 2026 17:08:20 +0200 Message-ID: <87v77oumcb.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 9 X-Spam_score: 0.9 X-Spam_bar: / X-Spam_report: (0.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.341, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org John Snow writes: > On Tue, Sep 29, 2026, 9:09=E2=80=AFAM Markus Armbruster wrote: > >> John Snow writes: >> >> > I promised I'd remove this. >> > >> > Signed-off-by: John Snow >> > --- >> > scripts/qapi/parser.py | 49 ++++++------------------------------------ >> > 1 file changed, 7 insertions(+), 42 deletions(-) >> > >> > diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py >> > index c14bff2cbc3..5fc9c18c81d 100644 >> > --- a/scripts/qapi/parser.py >> > +++ b/scripts/qapi/parser.py >> > @@ -862,49 +862,15 @@ def _insert_near_kind( >> > return True >> > return False >> > >> > - def _insert_after_intro( >> > - self, >> > - section: 'QAPIDoc.Section', >> > - ) -> None: >> > - """ >> > - Insert a section immediately after the intro section. >> > - >> > - While we convert DETAILS sections to INTRO sections, all >> > - contiguous INTRO/DETAILS sections at the start of a QAPIDoc >> > - section list are treated as "the intro". >> > - >> > - Once INTRO conversion is complete, this helper will no longer= be >> > - needed and ``_insert_near_kind(QAPIDoc.Kind.INTRO, ...)`` will >> > - be sufficient. >> > - """ >> > - first =3D self.all_sections[0] >> > - if first.text and first.kind =3D=3D QAPIDoc.Kind.INTRO: >> > - # First section is introduction and is non-empty: insert = here. >> > - # Rest assured all of this ugliness will very soon go awa= y. >> > - # Pinkie-swear. >> > - self.all_sections.insert(1, section) >> > - return >> > - >> > - index =3D 0 >> > - for index, ref_section in enumerate(self.all_sections): >> > - if ref_section.kind.name in ("INTRO", "DETAILS"): >> > - continue >> > - break >> > - else: >> > - index +=3D 1 >> > - >> > - self.all_sections.insert(index, section) >> > - >> > def append_member_stub(self, stub: 'QAPIDoc.Section') -> None: >> > - >> > """ >> > Append a stub section after any Member sections. >> > """ >> > if self._insert_near_kind(QAPIDoc.Kind.MEMBER, stub, True): >> > return >> > >> > - # No MEMBER sections present. Insert after INTRO/DETAILS sect= ions. >> > - self._insert_after_intro(stub) >> > + # No MEMBER sections present. Insert after INTRO section. >> > + self._insert_near_kind(QAPIDoc.Kind.INTRO, stub, after=3DTrue) >> >> There can only be one INTRO section, and it must be first. So this must >> be equivalent to >> >> self.all_sections.(1, stub) >> >> Correct? >> >> The argument for using the more complex ._insert_near_kind() is of >> course symmetry with the other case. Okay. >> > > Yep, largely symmetry and opting to not write new logic as much as I can > get away with in this patch. There's a compelling reason for not wasting > much time writing new, cleaner logic... > > >> We have three ._insert_near_kind() calls: >> >> if self._insert_near_kind(QAPIDoc.Kind.MEMBER, stub, True): >> >> self._insert_near_kind(QAPIDoc.Kind.INTRO, stub, after=3DTrue) >> >> if any(self._insert_near_kind(kind, stub, after) for kind, after >> in ( >> [...] >> )): >> >> None of them omit the optional last argument. Two pass it positionally, >> one as a keyword argument. Let's dumb this down to mandatory argument. >> > > I'll do you one better, that entire method goes away by the end of this > series and we don't have to worry about it. > > No sense putting lipstick on the pig enroute to the slaughterhouse. I see. Recommend to keep the new call similar to the existing one nearby regardless, i.e. pass True, not after=3DTrue. [...]