From patchwork Tue Nov 5 00:37:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 288440 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 29B812C009C for ; Tue, 5 Nov 2013 19:43:03 +1100 (EST) Received: from localhost ([::1]:53928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdcE0-0007wW-Gn for incoming@patchwork.ozlabs.org; Tue, 05 Nov 2013 03:43:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdcBL-000500-D7 for qemu-devel@nongnu.org; Tue, 05 Nov 2013 03:40:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdcB9-0002cX-PX for qemu-devel@nongnu.org; Tue, 05 Nov 2013 03:40:15 -0500 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:59111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdcB9-0002Ve-5D for qemu-devel@nongnu.org; Tue, 05 Nov 2013 03:40:03 -0500 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 5 Nov 2013 14:10:01 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp09.in.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 5 Nov 2013 14:09:59 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id DDA49E0055 for ; Tue, 5 Nov 2013 14:11:43 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rA58dsh637552268 for ; Tue, 5 Nov 2013 14:09:54 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rA58dwwl016092 for ; Tue, 5 Nov 2013 14:09:59 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id rA58dloC015444; Tue, 5 Nov 2013 14:09:57 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Tue, 5 Nov 2013 08:37:37 +0800 Message-Id: <1383611860-9053-8-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1383611860-9053-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1383611860-9053-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13110508-2674-0000-0000-00000B5B70E3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.9 Cc: kwolf@redhat.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH RFC 07/10] qapi script: support direct inheritance for struct 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 Now it is possible to inherit another struct inside data directly, which saves trouble to define trivial structure. Signed-off-by: Wenchao Xia --- docs/qapi-code-gen.txt | 21 +++++++++++++++++++++ scripts/qapi-visit.py | 14 ++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt index 0728f36..3e42ff4 100644 --- a/docs/qapi-code-gen.txt +++ b/docs/qapi-code-gen.txt @@ -70,6 +70,27 @@ both fields like this: { "file": "/some/place/my-image", "backing": "/some/place/my-backing-file" } +It is possible to directly inherit other struct by keyword '_base': + + { 'type': 'NetworkConnectionInfo', 'data': { 'host': 'str', 'service': 'str' } } + { 'type': 'VncConnectionInfo', + 'data': { + 'server': { + '_base': 'NetworkConnectionInfo', + '*auth': 'str' }, + 'client': 'NetworkConnectionInfo' + } } + +Result on the wire could be: + +{ + "server": { "host": "192.168.1.1", + "service": "8080", + "auth': "none" }, + "client": { "host": "192.168.1.2", + "service": "1223" } +} + === Enumeration types === An enumeration type is a dictionary containing a single key whose value is a diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 2b13ad0..f0f0942 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -17,7 +17,7 @@ import os import getopt import errno -def generate_visit_struct_fields(name, field_prefix, fn_prefix, members, base = None): +def generate_visit_struct_fields(name, field_prefix, fn_prefix, members, base = None, base_name = 'base'): substructs = [] ret = '' full_name = name if not fn_prefix else "%s_%s" % (name, fn_prefix) @@ -30,8 +30,14 @@ def generate_visit_struct_fields(name, field_prefix, fn_prefix, members, base = nested_fn_prefix = "%s_%s" % (fn_prefix, argname) nested_field_prefix = "%s%s." % (field_prefix, argname) + + _base = argentry.get('_base') + if _base: + del argentry['_base'] + ret += generate_visit_struct_fields(name, nested_field_prefix, - nested_fn_prefix, argentry) + nested_fn_prefix, argentry, + _base, '_base') ret += mcgen(''' @@ -44,7 +50,7 @@ static void visit_type_%(full_name)s_fields(Visitor *m, %(name)s ** obj, Error * if base: ret += mcgen(''' -visit_start_implicit_struct(m, obj ? (void**) &(*obj)->%(c_name)s : NULL, sizeof(%(type)s), &err); +visit_start_implicit_struct(m, obj ? (void**) &(*obj)->%(c_prefix)s%(c_name)s : NULL, sizeof(%(type)s), &err); if (!err) { visit_type_%(type)s_fields(m, obj ? &(*obj)->%(c_prefix)s%(c_name)s : NULL, &err); error_propagate(errp, err); @@ -53,7 +59,7 @@ if (!err) { } ''', c_prefix=c_var(field_prefix), - type=type_name(base), c_name=c_var('base')) + type=type_name(base), c_name=c_var(base_name)) for argname, argentry, optional, structured in parse_args(members): if optional: