From patchwork Fri Oct 19 02:42:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 192536 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 098C62C009A for ; Fri, 19 Oct 2012 15:13:33 +1100 (EST) Received: from localhost ([::1]:57885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2Z3-0006Xv-Ca for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 22:43:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2Xx-0004Dh-BJ for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TP2Xv-0002n9-K9 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:49 -0400 Received: from mail-oa0-f45.google.com ([209.85.219.45]:49553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2Xv-0002dj-Db for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:47 -0400 Received: by mail-oa0-f45.google.com with SMTP id i18so3273oag.4 for ; Thu, 18 Oct 2012 19:42:46 -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=DJ0y/ty12WwYlfWMxO8Ft9T6kb5X9UCPAwUlbkdtVCs=; b=sLk37P23xoxcZ1IbjJOtwi9woS05SqQJXy2cN2iA6MjfxaXe5ItOhbiorp9ry/ikSv Nqs+azMrRZckUAug9ddomp/FG7RBmry7hpIkI/9WQhBiKxQzHMtsTyGydZ5zALwxt/V2 pmd93YssdyKp7sAkMHVjqqfawH8ep38E4s+iVNSuHstLLwcg4lgsnfZLqBEtq49H7yOI HMR/bPeGYWR9TDj7rBU0RalLNXajOmSR4+fVxxE9WCLFWkMzCPoPJQoPQK59qLD3isN+ LFfieXjC7MdKgYtt8uRriiOHcRHPxCrJCdkbFoLCnEAMyDSZLjSB364wEfo/LdfWs9H4 tomA== Received: by 10.60.7.226 with SMTP id m2mr21438306oea.72.1350614566848; Thu, 18 Oct 2012 19:42:46 -0700 (PDT) Received: from loki.austin.ibm.com ([32.97.110.59]) by mx.google.com with ESMTPS id m6sm475144obk.3.2012.10.18.19.42.45 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 19:42:46 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 21:42:04 -0500 Message-Id: <1350614540-28583-11-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350614540-28583-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1350614540-28583-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.219.45 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 10/26] 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 Reviewed-by: Paolo Bonzini Signed-off-by: Michael Roth --- qapi/qmp-input-visitor.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c index 107d8d3..635106e 100644 --- a/qapi/qmp-input-visitor.c +++ b/qapi/qmp-input-visitor.c @@ -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);