From nobody Tue Feb 10 02:55:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1503410454333306.7732497557547; Tue, 22 Aug 2017 07:00:54 -0700 (PDT) Received: from localhost ([::1]:47254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dk9jh-00069l-4B for importer@patchew.org; Tue, 22 Aug 2017 10:00:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dk9JL-000825-C6 for qemu-devel@nongnu.org; Tue, 22 Aug 2017 09:33:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dk9JI-0006xN-38 for qemu-devel@nongnu.org; Tue, 22 Aug 2017 09:33:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58302) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dk9JH-0006wk-SP for qemu-devel@nongnu.org; Tue, 22 Aug 2017 09:33:36 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CBA0DC0467DC; Tue, 22 Aug 2017 13:24:45 +0000 (UTC) Received: from localhost (ovpn-112-43.ams2.redhat.com [10.36.112.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE3807E22E; Tue, 22 Aug 2017 13:24:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CBA0DC0467DC Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 22 Aug 2017 15:22:20 +0200 Message-Id: <20170822132255.23945-20-marcandre.lureau@redhat.com> In-Reply-To: <20170822132255.23945-1-marcandre.lureau@redhat.com> References: <20170822132255.23945-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 22 Aug 2017 13:24:45 +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 Subject: [Qemu-devel] [PATCH v2 19/54] qapi: add #if/#endif helpers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add helpers to generate #if/#endif and wrap visitor methods generating code. Used in the following patches. Signed-off-by: Marc-Andr=C3=A9 Lureau --- scripts/qapi.py | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/scripts/qapi.py b/scripts/qapi.py index 86845a28f9..52099332f1 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1892,6 +1892,57 @@ def guardend(name): name=3Dguardname(name)) =20 =20 +def gen_if(ifcond): + if not ifcond: + return '' + if isinstance(ifcond, str): + ifcond =3D [ifcond] + # Not using mcgen() because we don't want indent or \n stipped + ret =3D '\n' + for ifc in ifcond: + ret +=3D '#if %s\n' % ifc + ret +=3D '\n' + return ret + + +def gen_endif(ifcond): + if not ifcond: + return '' + if isinstance(ifcond, str): + ifcond =3D [ifcond] + # Not using mcgen() because we don't want indent or \n stipped + ret =3D '\n' + for ifc in reversed(ifcond): + ret +=3D '#endif /* %s */\n' % ifc + ret +=3D '\n' + return ret + + +# Wrap a method to add #if / #endif to generated code, only if some +# code was generated. +# self must have 'if_members' listing the attributes to wrap. +# The last argument of the wrapped function must be the 'ifcond'. +def ifcond_decorator(func): + + def func_wrapper(self, *args, **kwargs): + ifcond =3D args[-1] + save =3D {} + for mem in self.if_members: + save[mem] =3D getattr(self, mem) + func(self, *args, **kwargs) + for mem, val in save.items(): + newval =3D getattr(self, mem) + if newval !=3D val: + assert newval.startswith(val) + newval =3D newval[len(val):] + val +=3D gen_if(ifcond) + val +=3D newval + val +=3D gen_endif(ifcond) + setattr(self, mem, val) + + return func_wrapper + + def gen_enum_lookup(name, values, prefix=3DNone): ret =3D mcgen(''' =20 --=20 2.14.1.146.gd35faa819