From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScTTD-0007vk-BE for qemu-devel@nongnu.org; Wed, 06 Jun 2012 23:33:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScTTB-0000Cj-A4 for qemu-devel@nongnu.org; Wed, 06 Jun 2012 23:33:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScTTB-0000CW-1m for qemu-devel@nongnu.org; Wed, 06 Jun 2012 23:33:09 -0400 Message-ID: <4FD020ED.6040101@redhat.com> Date: Thu, 07 Jun 2012 11:33:01 +0800 From: Amos Kong MIME-Version: 1.0 References: <1338591268-23962-1-git-send-email-akong@redhat.com> <1338591268-23962-6-git-send-email-akong@redhat.com> <20120607001516.GE7733@illuin> In-Reply-To: <20120607001516.GE7733@illuin> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 5/6] qapi: generate list struct and visit_list for enum List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth Cc: aliguori@us.ibm.com, eblake@redhat.com, qemu-devel@nongnu.org, lcapitulino@redhat.com On 07/06/12 08:15, Michael Roth wrote: > On Sat, Jun 02, 2012 at 06:54:27AM +0800, Amos Kong wrote: >> Currently, if define an 'enum' and use it in one command's data, >> List struct for enum could not be generated, but it's used in >> qmp function. >> >> For example: KeyCodesList could not be generated. >>>>> qapi-schema.json: >> { 'enum': 'KeyCodes', >> 'data': [ 'shift', 'alt' ... ] } >> { 'command': 'sendkey', >> 'data': { 'keys': ['KeyCodes'], '*hold-time': 'int' } } >> >>>>> qmp-command.h: >> void qmp_sendkey(KeyCodesList * keys, bool has_hold_time, int64_t >> hold_time, Error **errp); >> >> This patch makes qapi can generate List struct for enum. >> >> Signed-off-by: Amos Kong >> --- >> scripts/qapi-types.py | 33 +++++++++++++++++++++++++++++---- >> scripts/qapi-visit.py | 14 +++++++++----- >> 2 files changed, 38 insertions(+), 9 deletions(-) >> >> diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py >> index 4a734f5..c9641fb 100644 >> --- a/scripts/qapi-types.py >> +++ b/scripts/qapi-types.py >> @@ -16,17 +16,36 @@ import os >> import getopt >> import errno >> >> -def generate_fwd_struct(name, members): >> - return mcgen(''' >> +def generate_fwd_struct(name, members, enum=False): >> + ret = "" >> + if not enum: >> + ret += mcgen(''' >> typedef struct %(name)s %(name)s; >> >> +''', >> + name=name) >> + ret += mcgen(''' >> typedef struct %(name)sList >> { >> - %(name)s *value; >> +''', >> + name=name) >> + if enum: >> + ret += mcgen(''' >> + %(name)s value; >> +''', >> + name=name) >> + else: >> + ret += mcgen(''' >> + %(name)s * value; >> +''', >> + name=name) >> + >> + ret += mcgen(''' >> struct %(name)sList *next; >> } %(name)sList; >> ''', >> name=name) >> + return ret >> >> def generate_struct(structname, fieldname, members): >> ret = mcgen(''' >> @@ -265,7 +284,8 @@ for expr in exprs: >> if expr.has_key('type'): >> ret += generate_fwd_struct(expr['type'], expr['data']) >> elif expr.has_key('enum'): >> - ret += generate_enum(expr['enum'], expr['data']) >> + ret += generate_enum(expr['enum'], expr['data']) + "\n" >> + ret += generate_fwd_struct(expr['enum'], expr['data'], True) >> fdef.write(generate_enum_lookup(expr['enum'], expr['data'])) >> elif expr.has_key('union'): >> ret += generate_fwd_struct(expr['union'], expr['data']) + "\n" >> @@ -289,6 +309,11 @@ for expr in exprs: >> fdef.write(generate_type_cleanup(expr['union'] + "List") + "\n") >> ret += generate_type_cleanup_decl(expr['union']) >> fdef.write(generate_type_cleanup(expr['union']) + "\n") >> + elif expr.has_key('enum'): >> + ret += generate_type_cleanup_decl(expr['enum'] + "List") >> + fdef.write(generate_type_cleanup(expr['enum'] + "List") + "\n") > > This one is fine > >> + ret += generate_type_cleanup_decl(expr['enum']) >> + fdef.write(generate_type_cleanup(expr['enum']) + "\n") > > but we don't need this one since enum types are passed around by copy. > > The qapi_free_X() functions are utility functions that aren't used by > the code generators, so there should be any harm in omitting these. Ok, will drop those two sentences. >> else: >> continue >> fdecl.write(ret) >> diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py >> index 8d4e94a..e44edfa 100644 >> --- a/scripts/qapi-visit.py >> +++ b/scripts/qapi-visit.py >> @@ -81,7 +81,7 @@ end: >> ''') >> return ret >> >> -def generate_visit_list(name, members): >> +def generate_visit_list(name, members, enum=False): >> return mcgen(''' >> > > Were there plans to add a branch for enum=True? Otherwise we can drop this > from the patch. redundant, will drop it. >> void visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, Error **errp) >> @@ -160,12 +160,14 @@ end: >> >> return ret >> >> -def generate_declaration(name, members, genlist=True): >> - ret = mcgen(''' >> +def generate_declaration(name, members, genlist=True, enum=False): >> + ret = "" >> + if not enum: >> + ret = mcgen(''' >> >> void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp); >> ''', >> - name=name) >> + name=name) >> >> if genlist: >> ret += mcgen(''' >> @@ -293,10 +295,12 @@ for expr in exprs: >> ret += generate_declaration(expr['union'], expr['data']) >> fdecl.write(ret) >> elif expr.has_key('enum'): >> - ret = generate_visit_enum(expr['enum'], expr['data']) >> + ret = generate_visit_list(expr['enum'], expr['data'], True) >> + ret += generate_visit_enum(expr['enum'], expr['data']) >> fdef.write(ret) >> >> ret = generate_decl_enum(expr['enum'], expr['data']) >> + ret += generate_declaration(expr['enum'], expr['data'], enum=True) >> fdecl.write(ret) >> >> fdecl.write(''' >> -- >> 1.7.1 >> >> -- Amos.