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 lists.gnu.org (lists.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 55165C05027 for ; Fri, 17 Feb 2023 08:29:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSw6v-0000ZB-Sq; Fri, 17 Feb 2023 03:28:53 -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 1pSw6s-0000Yd-OM for qemu-devel@nongnu.org; Fri, 17 Feb 2023 03:28:50 -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 1pSw6q-00069l-KL for qemu-devel@nongnu.org; Fri, 17 Feb 2023 03:28:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676622527; 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=8b9UKFGB3zaKtjNpU9qICyVtpz3E/bPX1xwD0lr9DrM=; b=Y8XLuu6Z7piC8re1dF01aIWFuwOJrDJcloTdey+7tGZzqRWan34l6kPA+BPLCNpeN1raQK Niofb0+xPNfQAriLIsYKZrD6IlTdpquNDsPsGrZ8Iu+opJ62okLOv+lp8pH0BQSRoRIuvJ xLmAvSSOxgm8h5PzJgSy/T7VUWX6Gvg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-135-WUeu6zWGN9O2EbmJt4dPcw-1; Fri, 17 Feb 2023 03:28:44 -0500 X-MC-Unique: WUeu6zWGN9O2EbmJt4dPcw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8CBF585D180; Fri, 17 Feb 2023 08:28:43 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 18DED140EBF4; Fri, 17 Feb 2023 08:28:43 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 09A9F21E6A1F; Fri, 17 Feb 2023 09:28:42 +0100 (CET) From: Markus Armbruster To: marcandre.lureau@redhat.com Cc: qemu-devel@nongnu.org, Beraldo Leal , Eric Blake , Stefan Weil , Alex =?utf-8?Q?Benn?= =?utf-8?Q?=C3=A9e?= , Paolo Bonzini , Laurent Vivier , "Dr. David Alan Gilbert" , Gerd Hoffmann , Michael Roth , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Daniel P. =?utf-8?Q?Berrang=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta Subject: Re: [PATCH v3 07/10] qapi: implement conditional command arguments References: <20230207142535.1153722-1-marcandre.lureau@redhat.com> <20230207142535.1153722-8-marcandre.lureau@redhat.com> Date: Fri, 17 Feb 2023 09:28:42 +0100 In-Reply-To: <20230207142535.1153722-8-marcandre.lureau@redhat.com> (marcandre lureau's message of "Tue, 7 Feb 2023 18:25:32 +0400") Message-ID: <87fsb4k85h.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) 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.7 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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org marcandre.lureau@redhat.com writes: > From: Marc-Andr=C3=A9 Lureau > > The generated code doesn't quite handle the conditional arguments. > For example, 'bar' in 'test-if-cmd' is not correctly surrounded by #if > conditions. See generated code in qmp_marshal_test_if_cmd(). > > Note that if there are multiple optional arguments at the last position, > there might be compilation issues due to extra comas. I left an assert > and FIXME for later. > > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > scripts/qapi/commands.py | 4 ++++ > scripts/qapi/gen.py | 19 ++++++++++++++----- > scripts/qapi/visit.py | 2 ++ > tests/qapi-schema/qapi-schema-test.json | 3 ++- > 4 files changed, 22 insertions(+), 6 deletions(-) > > diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py > index 79c5e5c3a9..07997d1586 100644 > --- a/scripts/qapi/commands.py > +++ b/scripts/qapi/commands.py > @@ -64,9 +64,13 @@ def gen_call(name: str, > elif arg_type: > assert not arg_type.variants > for memb in arg_type.members: > + if memb.ifcond.is_present(): > + argstr +=3D '\n' + memb.ifcond.gen_if() > if memb.need_has(): > argstr +=3D 'arg.has_%s, ' % c_name(memb.name) > argstr +=3D 'arg.%s, ' % c_name(memb.name) > + if memb.ifcond.is_present(): > + argstr +=3D '\n' + memb.ifcond.gen_endif() >=20=20 > lhs =3D '' > if ret_type: @argstr is emitted further down: %(lhs)sqmp_%(name)s(%(args)s&err); ''', name=3Dname, args=3Dargstr, lhs=3Dlhs) ret +=3D mcgen(''' if (err) { ''') Before the patch, @argstr contains no newlines. Works. After the patch, it may contain newlines, and if it does, intentation is messed up. For instance, in the code generated for qapi-schema-test.json: retval =3D qmp_test_if_cmd(arg.foo,=20 #if defined(TEST_IF_CMD_BAR) arg.bar,=20 #endif /* defined(TEST_IF_CMD_BAR) */ &err); Strings interpolated into the mcgen() argument should not contain newlines. I'm afraid you have to rewrite the code emitting the call. > diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py > index b5a8d03e8e..ba57e72c9b 100644 > --- a/scripts/qapi/gen.py > +++ b/scripts/qapi/gen.py > @@ -111,22 +111,31 @@ def build_params(arg_type: Optional[QAPISchemaObjec= tType], > boxed: bool, > extra: Optional[str] =3D None) -> str: > ret =3D '' > - sep =3D '' > if boxed: > assert arg_type > ret +=3D '%s arg' % arg_type.c_param_type() > - sep =3D ', ' > + if extra: > + ret +=3D ', ' > elif arg_type: > assert not arg_type.variants > + n =3D 0 > for memb in arg_type.members: > - ret +=3D sep > - sep =3D ', ' > + n +=3D 1 > + if memb.ifcond.is_present(): > + ret +=3D '\n' + memb.ifcond.gen_if() > if memb.need_has(): > ret +=3D 'bool has_%s, ' % c_name(memb.name) > ret +=3D '%s %s' % (memb.type.c_param_type(), > c_name(memb.name)) > + if extra or n !=3D len(arg_type.members): > + ret +=3D ', ' > + else: > + # FIXME: optional last argument may break compilation > + assert not memb.ifcond.is_present() Does the assertion guard against the C compilation failure? Is it possible to write schema code that triggers it? > + if memb.ifcond.is_present(): > + ret +=3D '\n' + memb.ifcond.gen_endif() > if extra: > - ret +=3D sep + extra > + ret +=3D extra > return ret if ret else 'void' >=20=20 >=20=20 Same newline issue as in gen_call(). Generated code: UserDefThree *qmp_test_if_cmd(TestIfStruct *foo,=20 #if defined(TEST_IF_CMD_BAR) TestIfEnum bar,=20 #endif /* defined(TEST_IF_CMD_BAR) */ Error **errp); > diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py > index 26a584ee4c..c56ea4d724 100644 > --- a/scripts/qapi/visit.py > +++ b/scripts/qapi/visit.py > @@ -74,11 +74,13 @@ def gen_visit_object_members(name: str, > sep =3D '' > for memb in members: > if memb.optional and not memb.need_has(): > + ret +=3D memb.ifcond.gen_if() > ret +=3D mcgen(''' > bool has_%(c_name)s =3D !!obj->%(c_name)s; > ''', > c_name=3Dc_name(memb.name)) > sep =3D '\n' > + ret +=3D memb.ifcond.gen_endif() > ret +=3D sep >=20=20 > if base: This hunk has no effect on the code generated for our schemas as far as I can tell. Is it superfluous? Incorrect? Gap in test coverage? Or am I confused? > diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/= qapi-schema-test.json > index ba7302f42b..baa4e69f63 100644 > --- a/tests/qapi-schema/qapi-schema-test.json > +++ b/tests/qapi-schema/qapi-schema-test.json > @@ -258,7 +258,8 @@ >=20=20 > { 'event': 'TEST_IF_EVENT', > 'data': { 'foo': 'TestIfStruct', > - 'bar': { 'type': ['TestIfEnum'], 'if': 'TEST_IF_EVT_BAR' } }, > + 'bar': { 'type': ['TestIfEnum'], 'if': 'TEST_IF_EVT_BAR' }, > + 'baz': 'int' }, > 'if': { 'all': ['TEST_IF_EVT', 'TEST_IF_STRUCT'] } } >=20=20 > { 'event': 'TEST_IF_EVENT2', 'data': {},