From nobody Mon Feb 9 10:29:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488317477221961.9831491039453; Tue, 28 Feb 2017 13:31:17 -0800 (PST) Received: from localhost ([::1]:37065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cipMZ-0001bh-Sh for importer@patchew.org; Tue, 28 Feb 2017 16:31:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cipIp-0007Us-VP for qemu-devel@nongnu.org; Tue, 28 Feb 2017 16:27:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cipIm-0000v9-Hy for qemu-devel@nongnu.org; Tue, 28 Feb 2017 16:27:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37228) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cipIi-0000op-8s; Tue, 28 Feb 2017 16:27:16 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A17461BB9; Tue, 28 Feb 2017 21:27:16 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1SLRE4V023281 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 28 Feb 2017 16:27:15 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 422BF11386DC; Tue, 28 Feb 2017 22:27:10 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 28 Feb 2017 22:26:52 +0100 Message-Id: <1488317230-26248-7-git-send-email-armbru@redhat.com> In-Reply-To: <1488317230-26248-1-git-send-email-armbru@redhat.com> References: <1488317230-26248-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 28 Feb 2017 21:27:16 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 06/24] qapi: Factor out common part of qobject input visitor creation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pkrempa@redhat.com, mdroth@linux.vnet.ibm.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Kevin Wolf --- qapi/qobject-input-visitor.c | 61 +++++++++++++++++++---------------------= ---- 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index e2e3e70..270033e 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -619,22 +619,34 @@ static void qobject_input_free(Visitor *v) g_free(qiv); } =20 +static QObjectInputVisitor *qobject_input_visitor_base_new(QObject *obj) +{ + QObjectInputVisitor *v =3D g_malloc0(sizeof(*v)); + + assert(obj); + + v->visitor.type =3D VISITOR_INPUT; + v->visitor.start_struct =3D qobject_input_start_struct; + v->visitor.check_struct =3D qobject_input_check_struct; + v->visitor.end_struct =3D qobject_input_pop; + v->visitor.start_list =3D qobject_input_start_list; + v->visitor.next_list =3D qobject_input_next_list; + v->visitor.check_list =3D qobject_input_check_list; + v->visitor.end_list =3D qobject_input_pop; + v->visitor.start_alternate =3D qobject_input_start_alternate; + v->visitor.optional =3D qobject_input_optional; + v->visitor.free =3D qobject_input_free; + + v->root =3D obj; + qobject_incref(obj); + + return v; +} + Visitor *qobject_input_visitor_new(QObject *obj) { - QObjectInputVisitor *v; + QObjectInputVisitor *v =3D qobject_input_visitor_base_new(obj); =20 - assert(obj); - v =3D g_malloc0(sizeof(*v)); - - v->visitor.type =3D VISITOR_INPUT; - v->visitor.start_struct =3D qobject_input_start_struct; - v->visitor.check_struct =3D qobject_input_check_struct; - v->visitor.end_struct =3D qobject_input_pop; - v->visitor.start_list =3D qobject_input_start_list; - v->visitor.next_list =3D qobject_input_next_list; - v->visitor.check_list =3D qobject_input_check_list; - v->visitor.end_list =3D qobject_input_pop; - v->visitor.start_alternate =3D qobject_input_start_alternate; v->visitor.type_int64 =3D qobject_input_type_int64; v->visitor.type_uint64 =3D qobject_input_type_uint64; v->visitor.type_bool =3D qobject_input_type_bool; @@ -642,30 +654,14 @@ Visitor *qobject_input_visitor_new(QObject *obj) v->visitor.type_number =3D qobject_input_type_number; v->visitor.type_any =3D qobject_input_type_any; v->visitor.type_null =3D qobject_input_type_null; - v->visitor.optional =3D qobject_input_optional; - v->visitor.free =3D qobject_input_free; - - v->root =3D obj; - qobject_incref(obj); =20 return &v->visitor; } =20 Visitor *qobject_input_visitor_new_keyval(QObject *obj) { - QObjectInputVisitor *v; + QObjectInputVisitor *v =3D qobject_input_visitor_base_new(obj); =20 - v =3D g_malloc0(sizeof(*v)); - - v->visitor.type =3D VISITOR_INPUT; - v->visitor.start_struct =3D qobject_input_start_struct; - v->visitor.check_struct =3D qobject_input_check_struct; - v->visitor.end_struct =3D qobject_input_pop; - v->visitor.start_list =3D qobject_input_start_list; - v->visitor.next_list =3D qobject_input_next_list; - v->visitor.check_list =3D qobject_input_check_list; - v->visitor.end_list =3D qobject_input_pop; - v->visitor.start_alternate =3D qobject_input_start_alternate; v->visitor.type_int64 =3D qobject_input_type_int64_keyval; v->visitor.type_uint64 =3D qobject_input_type_uint64_keyval; v->visitor.type_bool =3D qobject_input_type_bool_keyval; @@ -674,11 +670,6 @@ Visitor *qobject_input_visitor_new_keyval(QObject *obj) v->visitor.type_any =3D qobject_input_type_any; v->visitor.type_null =3D qobject_input_type_null; v->visitor.type_size =3D qobject_input_type_size_keyval; - v->visitor.optional =3D qobject_input_optional; - v->visitor.free =3D qobject_input_free; - - v->root =3D obj; - qobject_incref(obj); =20 return &v->visitor; } --=20 2.7.4