From patchwork Mon Dec 21 17:08:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 559636 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4A1BA140313 for ; Tue, 22 Dec 2015 04:11:54 +1100 (AEDT) Received: from localhost ([::1]:46304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aB400-0003Ff-4Z for incoming@patchwork.ozlabs.org; Mon, 21 Dec 2015 12:11:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aB3x3-0006mt-JV for qemu-devel@nongnu.org; Mon, 21 Dec 2015 12:08:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aB3wz-0006XE-IP for qemu-devel@nongnu.org; Mon, 21 Dec 2015 12:08:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aB3wz-0006X9-Cd for qemu-devel@nongnu.org; Mon, 21 Dec 2015 12:08:45 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 275E68CF4D for ; Mon, 21 Dec 2015 17:08:45 +0000 (UTC) Received: from red.redhat.com (ovpn-113-139.phx2.redhat.com [10.3.113.139]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBLH8gdh008283; Mon, 21 Dec 2015 12:08:44 -0500 From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 21 Dec 2015 10:08:09 -0700 Message-Id: <1450717720-9627-5-git-send-email-eblake@redhat.com> In-Reply-To: <1450717720-9627-1-git-send-email-eblake@redhat.com> References: <1450717720-9627-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: armbru@redhat.com, Luiz Capitulino Subject: [Qemu-devel] [PATCH v8 04/35] hmp: Improve use of qapi visitor 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 Cache the visitor in a local variable instead of repeatedly calling the accessor. Pass NULL for the visit_start_struct() object (which matches the fact that we were already passing 0 for the size argument, because we aren't using the visit to allocate a qapi struct). Signed-off-by: Eric Blake Reviewed-by: Marc-André Lureau --- v8: no change v7: place earlier in series, drop attempts to provide a 'kind' string, drop bogus avoidance of qmp_object_del() on error v6: new patch, split from RFC on v5 7/46 --- hmp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hmp.c b/hmp.c index c2b2c16..0d21f1d 100644 --- a/hmp.c +++ b/hmp.c @@ -1667,9 +1667,9 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) QemuOpts *opts; char *type = NULL; char *id = NULL; - void *dummy = NULL; OptsVisitor *ov; QDict *pdict; + Visitor *v; opts = qemu_opts_from_qdict(qemu_find_opts("object"), qdict, &err); if (err) { @@ -1678,28 +1678,29 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) ov = opts_visitor_new(opts); pdict = qdict_clone_shallow(qdict); + v = opts_get_visitor(ov); - visit_start_struct(opts_get_visitor(ov), &dummy, NULL, NULL, 0, &err); + visit_start_struct(v, NULL, NULL, NULL, 0, &err); if (err) { goto out_clean; } qdict_del(pdict, "qom-type"); - visit_type_str(opts_get_visitor(ov), &type, "qom-type", &err); + visit_type_str(v, &type, "qom-type", &err); if (err) { goto out_end; } qdict_del(pdict, "id"); - visit_type_str(opts_get_visitor(ov), &id, "id", &err); + visit_type_str(v, &id, "id", &err); if (err) { goto out_end; } - object_add(type, id, pdict, opts_get_visitor(ov), &err); + object_add(type, id, pdict, v, &err); out_end: - visit_end_struct(opts_get_visitor(ov), &err_end); + visit_end_struct(v, &err_end); if (!err && err_end) { qmp_object_del(id, NULL); } @@ -1711,7 +1712,6 @@ out_clean: qemu_opts_del(opts); g_free(id); g_free(type); - g_free(dummy); out: hmp_handle_error(mon, &err);