From patchwork Wed Apr 24 16:08:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 239268 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 516F92C070B for ; Thu, 25 Apr 2013 02:08:25 +1000 (EST) Received: from localhost ([::1]:60276 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV2F5-0001kz-FF for incoming@patchwork.ozlabs.org; Wed, 24 Apr 2013 12:08:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV2Eo-0001gV-D4 for qemu-devel@nongnu.org; Wed, 24 Apr 2013 12:08:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UV2Ej-0000fe-Ig for qemu-devel@nongnu.org; Wed, 24 Apr 2013 12:08:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25533) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV2Ej-0000fP-AJ for qemu-devel@nongnu.org; Wed, 24 Apr 2013 12:08:01 -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 r3OG7gNV000391 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 24 Apr 2013 12:07:43 -0400 Received: from dhcp-8-167.nay.redhat.com ([10.66.4.143]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3OG7d4M020610; Wed, 24 Apr 2013 12:07:39 -0400 From: Amos Kong To: mdroth@linux.vnet.ibm.com, aliguori@us.ibm.com, qemu-devel@nongnu.org Date: Thu, 25 Apr 2013 00:08:05 +0800 Message-Id: <1366819685-24106-1-git-send-email-akong@redhat.com> In-Reply-To: <20130419052612.GA10011@t430s.nay.redhat.com> References: <20130419052612.GA10011@t430s.nay.redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: stefanha@gmail.com, vilanova@ac.upc.edu, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v2] qapi: add struct strList and visit_type_strList() 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 we can only use ['String'] to add string to a list, it contains some additional JSON structure. "multicast": [ { "str": "01:80:c2:00:00:21" }, { "str": "00:00:00:00:00:00" } ] This patch adds struct strList and visit function, we can use ['str'] in schema file. "multicast": [ "01:00:5e:00:00:01", "33:33:ff:12:34:57" ] V2: remove ugly #ifndef, add forward declaration in qapi-types.h, and define the struct in include/qapi/visitor.h (Paolo) Signed-off-by: Amos Kong Reviewed-by: Paolo Bonzini --- include/qapi/visitor.h | 7 +++++++ qapi/qapi-visit-core.c | 23 +++++++++++++++++++++++ scripts/qapi-types.py | 1 + scripts/qapi.py | 4 ++-- 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h index 1fef18c..743ff92 100644 --- a/include/qapi/visitor.h +++ b/include/qapi/visitor.h @@ -22,6 +22,11 @@ typedef struct GenericList struct GenericList *next; } GenericList; +typedef struct strList { + char *value; + struct strList *next; +} strList; + typedef struct Visitor Visitor; void visit_start_handle(Visitor *v, void **obj, const char *kind, @@ -50,6 +55,8 @@ void visit_type_int64(Visitor *v, int64_t *obj, const char *name, Error **errp); void visit_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp); void visit_type_bool(Visitor *v, bool *obj, const char *name, Error **errp); void visit_type_str(Visitor *v, char **obj, const char *name, Error **errp); +void visit_type_strList(Visitor *m, strList ** obj, const char *name, + Error **errp); void visit_type_number(Visitor *v, double *obj, const char *name, Error **errp); #endif diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 401ee6e..dc54cc8 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -257,6 +257,29 @@ void visit_type_str(Visitor *v, char **obj, const char *name, Error **errp) } } +void visit_type_strList(Visitor *m, strList ** obj, const char *name, + Error **errp) +{ + GenericList *i, **prev = (GenericList **)obj; + Error *err = NULL; + + if (!error_is_set(errp)) { + visit_start_list(m, name, &err); + if (!err) { + for (; (i = visit_next_list(m, prev, &err)) != NULL; prev = &i) { + strList *native_i = (strList *)i; + visit_type_str(m, &native_i->value, NULL, &err); + } + error_propagate(errp, err); + err = NULL; + + /* Always call end_list if start_list succeeded. */ + visit_end_list(m, &err); + } + error_propagate(errp, err); + } +} + void visit_type_number(Visitor *v, double *obj, const char *name, Error **errp) { if (!error_is_set(errp)) { diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 9e19920..e449a14 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -276,6 +276,7 @@ fdecl.write(mcgen(''' #include #include +struct strList; ''', guard=guardname(h_file))) diff --git a/scripts/qapi.py b/scripts/qapi.py index afc5f32..14f9f4d 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -166,11 +166,11 @@ def c_fun(name, protect=True): return c_var(name, protect).replace('.', '_') def c_list_type(name): - return '%sList' % name + return 'struct %sList' % name def type_name(name): if type(name) == list: - return c_list_type(name[0]) + return '%sList' % name[0] return name enum_types = []