From nobody Mon Oct 6 21:23:52 2025 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=1678106026; cv=none; d=zohomail.com; s=zohoarc; b=BlObgBAHVmvabZ0He2g+kka0nOuP/Lld8qSS2KfQ+iwShb/poDXy0nDN63XlTnkTudr7wbSlZDGFFbNho5UccZjya4ABuknVEPF4ztlWIQNRRdclSZ218F8CK6P53Tm5uRT1mzG6Q7w4EcQiFDrZz2eMLEMhAM+Vj0SFUxo5Ias= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678106026; 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=bu0nSiCU+C/5t2FSu0ntDv4BlvxCta95wWhADz5BY5k=; b=jijT+I16GRNHWtKfvE2Dn/22wtywjwPqTY7C/0TiOMSX9ZVR0724QlE2tP0PwT9OSrVS0PtIMpbILaaydNEovQm2R6WFnZnnYe9b0J/nLChwVTjVjkigg9I4dxE2JvXN7dgypNbc+eSVvYgMLwp/lK2B2cPVo/oykA3cH9mL+ZQ= 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 1678106026659139.7382609312034; Mon, 6 Mar 2023 04:33:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZ9y4-0008NA-Mw; Mon, 06 Mar 2023 07:29:28 -0500 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 1pZ9xR-0007em-Eb for qemu-devel@nongnu.org; Mon, 06 Mar 2023 07:28:51 -0500 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 1pZ9xP-0003Lr-8v for qemu-devel@nongnu.org; Mon, 06 Mar 2023 07:28:49 -0500 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-591-hXOhZz99OHi_qz8bOu_QBQ-1; Mon, 06 Mar 2023 07:28:39 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EE0E71C04325; Mon, 6 Mar 2023 12:28:30 +0000 (UTC) Received: from localhost (unknown [10.39.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1736940C83B6; Mon, 6 Mar 2023 12:28:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678105726; 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=bu0nSiCU+C/5t2FSu0ntDv4BlvxCta95wWhADz5BY5k=; b=eOROC2bRuutca29AbTERF4k78qc2N6pYBtljbNoA1OA2EiovXxCMBf88quvKRzxOIML7uo HYyQ5VMGsEcoLEm3doegq9AkGjBcTaaAoCwnce8IzZVtC16wmTlcyNY3ht47Bvv5pN5m0D 9afouVnIFhJa8qAW0oQZSxPAP1+nvBA= X-MC-Unique: hXOhZz99OHi_qz8bOu_QBQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Beraldo Leal , Wainer dos Santos Moschetta , Stefan Weil , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Eric Blake , "Dr. David Alan Gilbert" Subject: [PATCH v4 07/11] qapi/gen: run C code through clang-format, if possible Date: Mon, 6 Mar 2023 16:27:47 +0400 Message-Id: <20230306122751.2355515-8-marcandre.lureau@redhat.com> In-Reply-To: <20230306122751.2355515-1-marcandre.lureau@redhat.com> References: <20230306122751.2355515-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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=marcandre.lureau@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, 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.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: 1678106027189100001 From: Marc-Andr=C3=A9 Lureau Make the resulting code even prettier, if possible. Signed-off-by: Marc-Andr=C3=A9 Lureau --- scripts/qapi/gen.py | 15 ++++++++++++++- scripts/qapi/introspect.py | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py index b5a8d03e8e..c0ec9aa412 100644 --- a/scripts/qapi/gen.py +++ b/scripts/qapi/gen.py @@ -14,6 +14,7 @@ from contextlib import contextmanager import os import re +import subprocess from typing import ( Dict, Iterator, @@ -133,6 +134,7 @@ def build_params(arg_type: Optional[QAPISchemaObjectTyp= e], class QAPIGenCCode(QAPIGen): def __init__(self, fname: str): super().__init__(fname) + self.skip_format: bool =3D False self._start_if: Optional[Tuple[QAPISchemaIfCond, str, str]] =3D No= ne =20 def start_if(self, ifcond: QAPISchemaIfCond) -> None: @@ -149,7 +151,18 @@ def end_if(self) -> None: =20 def get_content(self) -> str: assert self._start_if is None - return super().get_content() + + text =3D super().get_content() + if not self.skip_format: + try: + text =3D subprocess.run(["clang-format"], + input=3Dtext, + text=3DTrue, + capture_output=3DTrue, + check=3DTrue).stdout + except FileNotFoundError: + pass + return text =20 =20 class QAPIGenC(QAPIGenCCode): diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 67c7d89aae..1a8cac37ef 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -174,6 +174,8 @@ def __init__(self, prefix: str, unmask: bool): super().__init__( prefix, 'qapi-introspect', ' * QAPI/QMP schema introspection', __doc__) + # for some reasons, the generated code is making clang-format go c= razy + self._genc.skip_format =3D True self._unmask =3D unmask self._schema: Optional[QAPISchema] =3D None self._trees: List[Annotated[SchemaInfo]] =3D [] --=20 2.39.2