Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F07DC3A59B for ; Fri, 30 Aug 2019 14:22:55 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6280821726 for ; Fri, 30 Aug 2019 14:22:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6280821726 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3hni-0007c5-Gz for qemu-devel@archiver.kernel.org; Fri, 30 Aug 2019 10:22:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42265) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3hTl-0003tk-15 for qemu-devel@nongnu.org; Fri, 30 Aug 2019 10:02:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i3hTb-00077s-T0 for qemu-devel@nongnu.org; Fri, 30 Aug 2019 10:02:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35916) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i3hTZ-00071r-Oj for qemu-devel@nongnu.org; Fri, 30 Aug 2019 10:02:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A8F583082B02; Fri, 30 Aug 2019 12:44:02 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-142.ams2.redhat.com [10.36.117.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5311319C58; Fri, 30 Aug 2019 12:44:02 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D79771165361; Fri, 30 Aug 2019 14:44:00 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org References: <20190828202641.24752-1-armbru@redhat.com> <20190828202641.24752-3-armbru@redhat.com> Date: Fri, 30 Aug 2019 14:44:00 +0200 In-Reply-To: <20190828202641.24752-3-armbru@redhat.com> (Markus Armbruster's message of "Wed, 28 Aug 2019 22:26:34 +0200") Message-ID: <87v9ueomb3.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 30 Aug 2019 12:44:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH 2/9] qapi: Drop support for boxed alternate for commands, events X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Markus Armbruster writes: > Commands and events can define their argument type inline (default) or > by referring to another type ('boxed': true, since commit c818408e44 > "qapi: Implement boxed types for commands/events", v2.7.0). The > unboxed inline definition is an (anonymous) struct type. The boxed > type may be a struct, union, or alternate type. > > The latter is problematic: docs/interop/qemu-spec.txt requires the > value of the 'data' key to be a json-object, but any non-degenerate > alternate type has at least one branch that isn't. > > Fortunately, we haven't made use of alternates in this context outside > tests/. Drop support for them. > > QAPISchemaAlternateType.is_empty() is now unused. Drop it, too. > > Signed-off-by: Markus Armbruster Need to squash in diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index c54c148263..54d02458b5 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -1711,15 +1711,13 @@ class QAPISchemaCommand(QAPISchemaEntity): QAPISchemaEntity.check(self, schema) if self._arg_type_name: self.arg_type = schema.lookup_type(self._arg_type_name) - assert (isinstance(self.arg_type, QAPISchemaObjectType) or - isinstance(self.arg_type, QAPISchemaAlternateType)) + assert isinstance(self.arg_type, QAPISchemaObjectType) self.arg_type.check(schema) if self.boxed: if self.arg_type.is_empty(): raise QAPISemError(self.info, "Cannot use 'boxed' with empty type") else: - assert not isinstance(self.arg_type, QAPISchemaAlternateType) assert not self.arg_type.variants elif self.boxed: raise QAPISemError(self.info, "Use of 'boxed' requires 'data'") @@ -1747,15 +1745,13 @@ class QAPISchemaEvent(QAPISchemaEntity): QAPISchemaEntity.check(self, schema) if self._arg_type_name: self.arg_type = schema.lookup_type(self._arg_type_name) - assert (isinstance(self.arg_type, QAPISchemaObjectType) or - isinstance(self.arg_type, QAPISchemaAlternateType)) + assert isinstance(self.arg_type, QAPISchemaObjectType) self.arg_type.check(schema) if self.boxed: if self.arg_type.is_empty(): raise QAPISemError(self.info, "Cannot use 'boxed' with empty type") else: - assert not isinstance(self.arg_type, QAPISchemaAlternateType) assert not self.arg_type.variants elif self.boxed: raise QAPISemError(self.info, "Use of 'boxed' requires 'data'") > --- > docs/devel/qapi-code-gen.txt | 12 ++++++------ > tests/qapi-schema/qapi-schema-test.json | 2 +- > scripts/qapi/common.py | 7 ++----- > tests/qapi-schema/qapi-schema-test.out | 2 +- > 4 files changed, 10 insertions(+), 13 deletions(-) > > diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt > index e8ec8ac1de..3d3931fb7a 100644 > --- a/docs/devel/qapi-code-gen.txt > +++ b/docs/devel/qapi-code-gen.txt > @@ -612,9 +612,9 @@ the command. Normally, 'data' is a dictionary for an anonymous type, > or names a struct type (possibly empty, but not a union), and its > members are passed as separate arguments to this function. If the > command definition includes a key 'boxed' with the boolean value true, > -then 'data' is instead the name of any non-empty complex type > -(struct, union, or alternate), and a pointer to that QAPI type is > -passed as a single argument. > +then 'data' is instead the name of any non-empty complex type (struct > +or union), and a pointer to that QAPI type is passed as a single > +argument. > > The generator also emits a marshalling function that extracts > arguments for the user's function out of an input QDict, calls the > @@ -714,9 +714,9 @@ The generator emits a function to send the event. Normally, 'data' is > a dictionary for an anonymous type, or names a struct type (possibly > empty, but not a union), and its members are passed as separate > arguments to this function. If the event definition includes a key > -'boxed' with the boolean value true, then 'data' is instead the name of > -any non-empty complex type (struct, union, or alternate), and a > -pointer to that QAPI type is passed as a single argument. > +'boxed' with the boolean value true, then 'data' is instead the name > +of any non-empty complex type (struct or union), and a pointer to that > +QAPI type is passed as a single argument. > > > === Features === > diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json > index c6d59acc3e..0fadb4ddd7 100644 > --- a/tests/qapi-schema/qapi-schema-test.json > +++ b/tests/qapi-schema/qapi-schema-test.json > @@ -180,7 +180,7 @@ > { 'event': 'EVENT_D', > 'data': { 'a' : 'EventStructOne', 'b' : 'str', '*c': 'str', '*enum3': 'EnumOne' } } > { 'event': 'EVENT_E', 'boxed': true, 'data': 'UserDefZero' } > -{ 'event': 'EVENT_F', 'boxed': true, 'data': 'UserDefAlternate' } > +{ 'event': 'EVENT_F', 'boxed': true, 'data': 'UserDefFlatUnion' } > > # test that we correctly compile downstream extensions, as well as munge > # ticklish names > diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py > index 9aefcfe015..c54c148263 100644 > --- a/scripts/qapi/common.py > +++ b/scripts/qapi/common.py > @@ -840,7 +840,7 @@ def check_command(expr, info): > > args_meta = ['struct'] > if boxed: > - args_meta += ['union', 'alternate'] > + args_meta += ['union'] > check_type(info, "'data' for command '%s'" % name, > expr.get('data'), allow_dict=not boxed, > allow_metas=args_meta) > @@ -858,7 +858,7 @@ def check_event(expr, info): > > meta = ['struct'] > if boxed: > - meta += ['union', 'alternate'] > + meta += ['union'] > check_type(info, "'data' for event '%s'" % name, > expr.get('data'), allow_dict=not boxed, > allow_metas=meta) > @@ -1690,9 +1690,6 @@ class QAPISchemaAlternateType(QAPISchemaType): > visitor.visit_alternate_type(self.name, self.info, self.ifcond, > self.variants) > > - def is_empty(self): > - return False > - > > class QAPISchemaCommand(QAPISchemaEntity): > def __init__(self, name, info, doc, ifcond, arg_type, ret_type, > diff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qapi-schema-test.out > index 85d510bc00..5470a525f5 100644 > --- a/tests/qapi-schema/qapi-schema-test.out > +++ b/tests/qapi-schema/qapi-schema-test.out > @@ -252,7 +252,7 @@ event EVENT_D q_obj_EVENT_D-arg > boxed=False > event EVENT_E UserDefZero > boxed=True > -event EVENT_F UserDefAlternate > +event EVENT_F UserDefFlatUnion > boxed=True > enum __org.qemu_x-Enum > member __org.qemu_x-value