From patchwork Fri Jun 1 22:54:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 162384 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A5799B700C for ; Sat, 2 Jun 2012 09:14:34 +1000 (EST) Received: from localhost ([::1]:40743 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SaakP-0004Ol-Sb for incoming@patchwork.ozlabs.org; Fri, 01 Jun 2012 18:55:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Saajq-0002q3-CL for qemu-devel@nongnu.org; Fri, 01 Jun 2012 18:54:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Saajn-0002HM-9i for qemu-devel@nongnu.org; Fri, 01 Jun 2012 18:54:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Saajn-0002Gu-18 for qemu-devel@nongnu.org; Fri, 01 Jun 2012 18:54:31 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q51MsTd2020390 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 1 Jun 2012 18:54:29 -0400 Received: from dhcp-8-167.nay.redhat.com (dhcp-8-167.nay.redhat.com [10.66.8.167]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q51MsC8f027383; Fri, 1 Jun 2012 18:54:27 -0400 From: Amos Kong To: aliguori@us.ibm.com, eblake@redhat.com, berrange@redhat.com, lcapitulino@redhat.com, qemu-devel@nongnu.org Date: Sat, 2 Jun 2012 06:54:27 +0800 Message-Id: <1338591268-23962-6-git-send-email-akong@redhat.com> In-Reply-To: <1338591268-23962-1-git-send-email-akong@redhat.com> References: <1338591268-23962-1-git-send-email-akong@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Amos Kong Subject: [Qemu-devel] [PATCH v2 5/6] qapi: generate list struct and visit_list for enum X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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") + ret += generate_type_cleanup_decl(expr['enum']) + fdef.write(generate_type_cleanup(expr['enum']) + "\n") 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(''' 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('''