From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VN0ok-0007AE-7w for qemu-devel@nongnu.org; Fri, 20 Sep 2013 09:32:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VN0of-00040U-A7 for qemu-devel@nongnu.org; Fri, 20 Sep 2013 09:32:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49652) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VN0of-00040C-1w for qemu-devel@nongnu.org; Fri, 20 Sep 2013 09:32:13 -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 r8KDWBHw021871 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 20 Sep 2013 09:32:12 -0400 Message-ID: <523C4E59.7070402@redhat.com> Date: Fri, 20 Sep 2013 15:32:09 +0200 From: Max Reitz MIME-Version: 1.0 References: <1379678070-14346-1-git-send-email-kwolf@redhat.com> <1379678070-14346-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1379678070-14346-2-git-send-email-kwolf@redhat.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 01/17] qapi-types/visit.py: Pass whole expr dict for structs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com On 2013-09-20 13:54, Kevin Wolf wrote: > Signed-off-by: Kevin Wolf > --- > scripts/qapi-types.py | 11 ++++++++--- > scripts/qapi-visit.py | 8 ++++++-- > 2 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py > index 5222463..566fe5e 100644 > --- a/scripts/qapi-types.py > +++ b/scripts/qapi-types.py > @@ -71,7 +71,7 @@ def generate_struct_fields(members): > c_name=c_var(argname)) > if structured: > push_indent() > - ret += generate_struct("", argname, argentry) > + ret += generate_struct({ "field": argname, "data": argentry}) > pop_indent() > else: > ret += mcgen(''' > @@ -81,7 +81,12 @@ def generate_struct_fields(members): > > return ret > > -def generate_struct(structname, fieldname, members): > +def generate_struct(expr): > + > + structname = expr.get('type', "") > + fieldname = expr.get('field', "") > + members = expr['data'] > + > ret = mcgen(''' > struct %(name)s > { > @@ -417,7 +422,7 @@ if do_builtins: > for expr in exprs: > ret = "\n" > if expr.has_key('type'): > - ret += generate_struct(expr['type'], "", expr['data']) + "\n" > + ret += generate_struct(expr) + "\n" This change passes expr['filter'] to generate_struct, if that field is set (in contrast to before, where an empty string was passed). This doesn't really make a difference, since defining the "field" key now results in linking errors (multiple definitions of that variable) where it was just ignored before (however, the behavior was undefined anyway). I just thought I'd say it. ;) Max > ret += generate_type_cleanup_decl(expr['type'] + "List") > fdef.write(generate_type_cleanup(expr['type'] + "List") + "\n") > ret += generate_type_cleanup_decl(expr['type']) > diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py > index 597cca4..1e44004 100644 > --- a/scripts/qapi-visit.py > +++ b/scripts/qapi-visit.py > @@ -120,7 +120,11 @@ if (!err) { > ''') > return ret > > -def generate_visit_struct(name, members): > +def generate_visit_struct(expr): > + > + name = expr['type'] > + members = expr['data'] > + > ret = generate_visit_struct_fields(name, "", "", members) > > ret += mcgen(''' > @@ -472,7 +476,7 @@ if do_builtins: > > for expr in exprs: > if expr.has_key('type'): > - ret = generate_visit_struct(expr['type'], expr['data']) > + ret = generate_visit_struct(expr) > ret += generate_visit_list(expr['type'], expr['data']) > fdef.write(ret) >