From patchwork Tue Aug 14 16:27:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 177386 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 994F92C0081 for ; Wed, 15 Aug 2012 03:04:41 +1000 (EST) Received: from localhost ([::1]:37491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1JzV-0001uF-TI for incoming@patchwork.ozlabs.org; Tue, 14 Aug 2012 12:29:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Jyu-0000dS-DZ for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1Jys-0006RH-3H for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:36 -0400 Received: from mail-gg0-f173.google.com ([209.85.161.173]:56676) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Jyr-0006O2-Us for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:34 -0400 Received: by mail-gg0-f173.google.com with SMTP id a5so649557ggn.4 for ; Tue, 14 Aug 2012 09:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=XFV/bg2z418SxijI9p5rUKdsvcPAfYTFT24MHL8w4PE=; b=pL7N1uTlD57R2NLWEKUpvpd0B1h/VOPtd2m6Kp/9C1TuPc55QcOCi3fx3FV23i8Va1 qLq71cUYBjPFv2pzRcs+BGNqL08CfwFB1SS9fO3A7dfVAb9iNYo075pRMKVVTIFTeA2F 8OIVpHu4GvlebBxdZVPNr/mBaou0nW01Ulwvb8vUnT1DA1oJ+VNBN7a7/EY8gGU2jMY+ rrZi7gmB4vfq05r+/FfC2ivt915WlvHNuApzXT5I65UDpzlNFrH6yu6K+xiLtknDjh8Y 3zKDQvUxt5s2VCu/m2yj3wjWYF5nNCVXnKL9ShY83Z9zY4x/q9uT6xfFRxnQGq8Dhkfa FBbQ== Received: by 10.50.184.138 with SMTP id eu10mr12847208igc.68.1344961712941; Tue, 14 Aug 2012 09:28:32 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id ul4sm11903203igb.15.2012.08.14.09.28.31 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Aug 2012 09:28:32 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2012 11:27:16 -0500 Message-Id: <1344961646-21194-11-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344961646-21194-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1344961646-21194-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.161.173 Cc: blauwirbel@gmail.com, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 10/20] qapi: QmpInputVisitor, implement array handling 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 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);