From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF3uD-0001QR-L6 for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF3u7-0007HB-PI for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:33 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:34534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF3u7-0007Cw-F7 for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:27 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so990551iea.4 for ; Fri, 21 Sep 2012 07:08:27 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Fri, 21 Sep 2012 09:07:33 -0500 Message-Id: <1348236465-23124-11-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1348236465-23124-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1348236465-23124-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 10/22] qapi: QmpInputVisitor, implement array handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, peter.maydell@linaro.org, aliguori@us.ibm.com, eblake@redhat.com Signed-off-by: Michael Roth --- qapi/qmp-input-visitor.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c index 107d8d3..c4388f3 100644 --- a/qapi/qmp-input-visitor.c +++ b/qapi/qmp-input-visitor.c @@ -132,7 +132,7 @@ static void qmp_input_start_struct(Visitor *v, void **obj, const char *kind, return; } - if (obj) { + if (obj && *obj == NULL) { *obj = g_malloc0(size); } } @@ -274,6 +274,33 @@ static void qmp_input_start_optional(Visitor *v, bool *present, *present = true; } +static void qmp_input_start_carray(Visitor *v, void **obj, const char *name, + size_t elem_count, size_t elem_size, + Error **errp) +{ + if (obj && *obj == NULL) { + *obj = g_malloc0(elem_count * elem_size); + } + qmp_input_start_list(v, name, errp); +} + +static void qmp_input_next_carray(Visitor *v, Error **errp) +{ + QmpInputVisitor *qiv = to_qiv(v); + StackObject *so = &qiv->stack[qiv->nb_stack - 1]; + + if (so->entry == NULL) { + so->entry = qlist_first(qobject_to_qlist(so->obj)); + } else { + so->entry = qlist_next(so->entry); + } +} + +static void qmp_input_end_carray(Visitor *v, Error **errp) +{ + qmp_input_end_list(v, errp); +} + Visitor *qmp_input_get_visitor(QmpInputVisitor *v) { return &v->visitor; @@ -302,6 +329,9 @@ QmpInputVisitor *qmp_input_visitor_new(QObject *obj) v->visitor.type_str = qmp_input_type_str; v->visitor.type_number = qmp_input_type_number; v->visitor.start_optional = qmp_input_start_optional; + v->visitor.start_carray = qmp_input_start_carray; + v->visitor.next_carray = qmp_input_next_carray; + v->visitor.end_carray = qmp_input_end_carray; qmp_input_push(v, obj, NULL); qobject_incref(obj); -- 1.7.9.5