From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51952)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1VF2fB-00024A-5j
	for qemu-devel@nongnu.org; Thu, 29 Aug 2013 09:53:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1VF2f5-0005ac-QJ
	for qemu-devel@nongnu.org; Thu, 29 Aug 2013 09:53:29 -0400
Received: from mx1.redhat.com ([209.132.183.28]:39123)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1VF2f5-0005aS-Ig
	for qemu-devel@nongnu.org; Thu, 29 Aug 2013 09:53:23 -0400
Received: from int-mx11.intmail.prod.int.phx2.redhat.com
	(int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7TDrM0P002402
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Thu, 29 Aug 2013 09:53:22 -0400
Date: Thu, 29 Aug 2013 09:52:47 -0400
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20130829095247.526626e5@redhat.com>
In-Reply-To: <20130827155859.GP648@dhcp-200-207.str.redhat.com>
References: <1374584606-5615-1-git-send-email-kwolf@redhat.com>
	<1374584606-5615-3-git-send-email-kwolf@redhat.com>
	<20130821033805.GA7028@amosk.info>
	<20130827155859.GP648@dhcp-200-207.str.redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 02/18] qapi-types.py: Implement 'base' for
 unions
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Kevin Wolf <kwolf@redhat.com>
Cc: Amos Kong <akong@redhat.com>, qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com

On Tue, 27 Aug 2013 17:58:59 +0200
Kevin Wolf <kwolf@redhat.com> wrote:

> Am 21.08.2013 um 05:38 hat Amos Kong geschrieben:
> > On Tue, Jul 23, 2013 at 03:03:10PM +0200, Kevin Wolf wrote:
> > > The new 'base' key in a union definition refers to a struct type, which
> > > is inlined into the union definition and can represent fields common to
> > > all kinds.
> > > 
> > > For example the following schema definition...
> > > 
> > >     { 'type': 'BlockOptionsBase', 'data': { 'read-only': 'bool' } }
> > > 
> > >     { 'union': 'BlockOptions',
> > >       'base': 'BlockOptionsBase',
> > >       'data': {
> > >           'raw': 'BlockOptionsRaw'
> > >           'qcow2': 'BlockOptionsQcow2'
> > >       } }
> > > 
> > > ...would result in this generated C struct:
> > > 
> > >     struct BlockOptions
> > >     {
> > >         BlockOptionsKind kind;
> > >         union {
> > >             void *data;
> > >             BlockOptionsRaw * raw;
> > >             BlockOptionsQcow2 * qcow2;
> > >         };
> > >         bool read_only;
> > >     };
> > > 
> > > Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> > > ---
> > >  scripts/qapi-types.py | 16 ++++++++++++++--
> > >  1 file changed, 14 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
> > > index e1239e1..9882b95 100644
> > > --- a/scripts/qapi-types.py
> > > +++ b/scripts/qapi-types.py
> > > @@ -157,7 +157,12 @@ typedef enum %(name)s
> > >  
> > >      return lookup_decl + enum_decl
> > >  
> > > -def generate_union(name, typeinfo):
> > > +def generate_union(expr):
> > > +
> > > +    name = expr['union']
> > > +    typeinfo = expr['data']
> > > +    base = expr.get('base')
> > > +
> > >      ret = mcgen('''
> > >  struct %(name)s
> > >  {
> > > @@ -176,6 +181,13 @@ struct %(name)s
> > >  
> > >      ret += mcgen('''
> > >      };
> > > +''')
> > > +
> > > +    if base:
> > > +        struct = find_struct(base)
> > > +        ret += generate_struct_fields(struct['data'])
> > 
> > 
> > generate_struct_fields() doesn't exist in upstream.
> > 
> > [qemu-upstream]$ grep generate_struct_fields -r *
> > scripts/qapi-types.py:        ret += generate_struct_fields(struct['data'])
> > [qemu-upstream]$
> 
> Yup, something went wrong while applying the series, that patch was
> simply dropped (and interestingly it didn't result in any conflicts or
> compile errors). I'll include it in my next pull request.

Strange, it appears on your pull request... But anyway, your series
made it into 1.6.0, so I think we'll need the missing patch in 1.6.1 too?