From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcE6D-000812-HF for qemu-devel@nongnu.org; Wed, 16 Sep 2015 10:54:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcE6A-00009S-AM for qemu-devel@nongnu.org; Wed, 16 Sep 2015 10:54:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcE6A-00009L-4K for qemu-devel@nongnu.org; Wed, 16 Sep 2015 10:54:14 -0400 Date: Wed, 16 Sep 2015 15:54:10 +0100 From: "Daniel P. Berrange" Message-ID: <20150916145410.GK21184@redhat.com> References: <1442401589-24189-1-git-send-email-armbru@redhat.com> <1442401589-24189-7-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1442401589-24189-7-git-send-email-armbru@redhat.com> Subject: Re: [Qemu-devel] [PATCH v8 06/26] qapi-types: Convert to QAPISchemaVisitor, fixing flat unions Reply-To: "Daniel P. Berrange" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com On Wed, Sep 16, 2015 at 01:06:09PM +0200, Markus Armbruster wrote: > Fixes flat unions to get the base's base members. Test case is from > commit 2fc0043, in qapi-schema-test.json: > > { 'union': 'UserDefFlatUnion', > 'base': 'UserDefUnionBase', > 'discriminator': 'enum1', > 'data': { 'value1' : 'UserDefA', > 'value2' : 'UserDefB', > 'value3' : 'UserDefB' } } > > { 'struct': 'UserDefUnionBase', > 'base': 'UserDefZero', > 'data': { 'string': 'str', 'enum1': 'EnumOne' } } > > { 'struct': 'UserDefZero', > 'data': { 'integer': 'int' } } > > Patch's effect on UserDefFlatUnion: > > struct UserDefFlatUnion { > /* Members inherited from UserDefUnionBase: */ > + int64_t integer; > char *string; > EnumOne enum1; > /* Own members: */ > union { /* union tag is @enum1 */ > void *data; > UserDefA *value1; > UserDefB *value2; > UserDefB *value3; > }; > }; > > Flat union visitors remain broken. They'll be fixed next. > > Two ugly special cases for simple unions now stand out like sore > thumbs: > > 1. The type tag is named 'type' everywhere, except in generated C, > where it's 'kind'. > > 2. QAPISchema lowers simple unions to semantically equivalent flat > unions. However, the C generated for a simple unions differs from > the C generated for its equivalent flat union, and we therefore > need special code to preserve that pointless difference for now. > > Mark both TODO. > > Signed-off-by: Markus Armbruster > --- > docs/qapi-code-gen.txt | 51 +++--- > scripts/qapi-types.py | 286 ++++++++++++++------------------ > scripts/qapi.py | 10 +- > tests/qapi-schema/qapi-schema-test.json | 4 +- > 4 files changed, 164 insertions(+), 187 deletions(-) Reviewed-by: Daniel P. Berrange Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|